line-wrapping tweaks
Merge branch 'master' into line-breaks