Merge branch 'release/2.11'
Merge branch 'master' of ssh://git.freepbx.org/freepbx/conferences into release/12.0