Set default role more sanely
Merge branch 'role' into hotfix