Part fix for #6923 language not being set.
Bump version
Merge branch 'develop' into release/2.11

Conflicts:
	module.xml