Merge remote-tracking branch 'origin/gggmy' into wsq3

Conflicts:
	Web/Web.Publish.xml