Update for FREEPBX-6923
Merge branch 'develop'
Part fix for #6923 language not being set.