Send up the part missing from the Avination Estate commit.
Warning - contains a small migration.
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim