Merge branch 'master' of ssh://git.freepbx.org/freepbx/cdr into release/12.0
Merge branch 'release/12.0' of ssh://git.freepbx.org/FREEPBX/cdr