Work on FREEPBX-7453
Merge branch 'develop' into release/2.11

Conflicts:
	module.xml