Merge branch 'master' into develop
case 2228 - Require permissions for editing rules.
Merge branch 'case-2228' into develop
Merge remote-tracking branch 'origin/develop'