- build changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.build/package.msbuild
	.nuget/packages.config