Whitespace cleanups
Whitespace fix
Fixed issue #868
Merge pull request #870 from hintjens/master

Fixed issue #868
Merge remote-tracking branch 'upstream/master'