Working on the MegaMUD macros
Merge commit '21268df498cd496f71a01d84faa32b2921abea06'