Fix back fixes for #1133 from Async-Sim.
Merge branch 'master' of git://github.com/aurora-sim/Aurora-Sim
Fix a null ref on creating roles.
Merge branch 'master' of git://github.com/aurora-sim/Aurora-Sim