Typo fix
Merge branch 'allow_multiple_roles' into features