Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjectGallery/ProjectGallery.v12.suo