test2
Merge remote-tracking branch 'origin/master'

Conflicts:
	PWD/PWD/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	PWD/PWD/obj/Debug/PWD.csproj.FileListAbsolute.txt