Merge branch 'ldmud36' of ssh://mgg/mudlib-public into ldmud36

Change-Id: Id3c731686758aead01b58333a69f308f123e4483