Fixing role creation errors.
Merge branch 'master' into 1.0