Small change to my previous commit: not so aggressive on the trigger, please.
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim