Merge pull request #422 from jbrodman/master

Fixes to build with ToT / M4 Macro Fix