Merge branch 'master' into alfa

Conflicts:
	BaseMultiLang.php
Fixing file...
Merge branch 'alfa'