Visual Studio
Merge remote-tracking branch 'origin/master'

Conflicts:
	PROJECT/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache