No automatic wrapping of text
Merge branch 'master' into scala