Merge pull request #1648 from rubenk/cleanup-whitespace