Fix problem where forced linebreaks could cause lines to disappear (due to recent changes to the linebreaking algorithm).
Merge branch 'fix-linebreaks' into develop