Merge branch 'master' of ssh://mgg/mudlib-public

Change-Id: I3dbef099d059825bd9fd83781e95274b5e5f7f3e