Merge pull request #1794 from sjinks/1.3.0

Remove duplicate macros