Cut long lines to preserve display sanity
Merge branch 'cut_long_lines'