Merge topic 'macro-args-docs'

f0db2e3 Help: Document macro argument caveats in more detail
Merge branch 'master' into next