Commit1112
Merge branch 'master' into Branch_On1005

Conflicts:
	GHVSProject/GHVSProject.v11.suo
Merge