- stash conflict merged
Merge branch 'master' into Branch_da749c332022c8521847e56bc75e43536e300597

Conflicts:
	Quyd/Quyd/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache