Merge branch 'master' into mysqli

Conflicts:
	html/modules/message/admin/class/myInstaller.class.php
Merge branch 'mysqli' into CorePack_mysqli