Remove some unnecessary whitespace changes added since 1.9.2
Remove other unneeded whitespace changes added since 1.9.2
Merge commit '6d9073fb840aee717814587c5f51f1a970669830' into HEAD