Merge remote-tracking branch 'origin/master'

Conflicts:
	SalesPlat-Auto.v12.suo