More line wrapping

Change-Id: I950c3da727fb97b58d96a872b0d2ed718cc60ba8
Merge pull request #2139 from dpursehouse/line-wrapping

More line wrapping