Merge remote-tracking branch 'upstream/master' into break_on_newline
Simplify hard break handling, as per the review
Merge branch 'break_on_newline'