Merge "Fix issue where line breaks would be wrong" into pi-dev