Merged requested to merge bitbucket/merged-pr-237 into branch/2.5
Created originally on Bitbucket by jdufresne (Jon Dufresne)
Was already merged in Bitbucket before import, marked as merged by the import user
Many editors clean up trailing white space on save. By removing it all in one go, it helps keep future diffs cleaner by avoiding spurious white space changes on unrelated lines.