Part fix for #6923 language not being set.
Tidy up xml, bump version
Merge branch 'release/2.11' into release/12.0

Conflicts:
	functions.inc.php
	module.xml