k
Merge remote-tracking branch 'origin/master'

Conflicts:

	pcbuild/pcbuild/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	pcbuild/pcbuild/obj/Debug/pcbuild.csproj.FileListAbsolute.txt
	pcbuild/pcbuild/obj/Debug/pcbuild.csprojResolveAssemblyReference.cache