Reduced number of lines for uniformity
Merge branch 'master' into whitespaceFixes