Merge pull request #1046 from reaperhulk/add-cms-macro

add a CMS macro