Merge pull request #78 from sushihangover/merges-to-mono-3.12.1

Merges to mono 3.12.1

Fix build, bad merge (one of the upstream pull requests)

Merge pull request #70 from sushihangover/merges-to-mono-3.8.0

Merges up to and a a few past the start of mono 3.8.1

Bump version number - play-3.6.1001

Merge commit 'e593b75bce2fe776a23445ca61fbc31ce9fd96ad'

Conflicts:
	configure.in

Merge commit '04fd2a832c57a8f4758c373a4335a80431ef2abf'

Conflicts:
	configure.in