Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Merge remote-tracking branch 'origin' into release
Merge branch 'release'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Merge branch 'development'
Fixed issue where any language other than english would cause all permissions to be removed for built-in roles.
Merge branch 'hotfix/7.x-1.0.2'
Merge tag '7.x-1.0.2' into development

Fixed issue where any language other than english would cause all permissions to be removed for built-in roles.