Strengthen some assumptions.
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim