Merge "Fix issue where line breaks would be wrong" into pi-dev am: dd49a8ccd7
am: c1bf01b026

Change-Id: I65b2ccc5cb365f341300b13476799bd101913c80