Merge branch 'master' into develop
case 3301 - More reliable check for campaign rules menu access.
Merge branch 'hotfix'