ensure that longer titles wrap to a second line
Merge branch 'maint-rel-1.6' into develop