Merge remote-tracking branch 'origin/master'

Conflicts:
	GM241/GM241.v12.suo