Pull in build fixes from dev

Conflicts:
	.nuget/NuGet.targets
	build.cmd