Whitespace fixes
Merge pull request #1142 from GrahamCampbell/tweaks

Whitespace Fixes
Merge branch '3.7' into 4.0
Merge branch '4.0' into 4.1