Allow non-formatting tokens to include newlines. Fixes #1151
Merge pull request #1158 from icambron/fix-format-newlines

Allow non-formatting tokens to include newlines