cleanup xss
Merge branch 'master' into develop
Redo module_hook calls to use static obj
vb
[Module Tag script: restart 12.0.1]
Merge branch 'release/12.0' of ssh://git.freepbx.org/freepbx/restart