broken xml
Merge branch 'release/2.11' into develop

Conflicts:
	module.xml