Fixed text wrapping on 3.x.  This fixes #196
Merge branch '2.x-maintenance'