Couple of bug fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache