l
Merge remote-tracking branch 'origin/master'

Conflicts:
	UploadFileTest.v12.suo
	UploadFileTest/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache