Merge remote-tracking branch 'origin/master'

Conflicts:
	Babel/Babel.sdf
	Babel/Babel.v12.suo