Fix duplicate role bug
Merge pull request #225 from CruGlobal/MH-791

Fix duplicate role bug
Merge branch 'master' into MH-637-gt