Collapse some often-created whitespace in generated HTML.
Merge branch 'collapse-whitespace' into beta

* collapse-whitespace:
  Collapse some often-created whitespace in generated HTML.