[Module Tag script: core 2.11.0.33]
FREEPBX-8064 - fix issue with calling $db object
[Module Tag script: core 2.11.0.34]
Merge branch 'release/2.11' into develop

Conflicts:
	functions.inc.php