Merge branch 'master' into OO

Conflicts:
	common/Bootstrap.php