Also shortened some long lines to make future diffs easier to read on the web interface.
Pull-Request has been merged by jakfrost
Also shortened some long lines to make future diffs easier to read on
the web interface.