Manually merged git repo with svn trunk.  Incorporated new macros in simple message