Implement the fixes from issue #1126.
Merge branch 'master' of git://github.com/aurora-sim/Aurora-Sim