Hotfix for roles view.
Merge branch 'master' into development