Merge pull request #826 from jimporter/line-breaks-are-markup