Merge remote-tracking branch 'origin/master'

Conflicts:
	MSBuild/Tasks/NuPrepare.cs
	NuBuild.sln
Merge branch 'master' into AddUnitTests

Conflicts:
	NuBuild.sln -> Taken mine.