whitespace cleanup
merged dadc75741cc34f6fd7abbf9b21c6b2c18e576e1f to b4fb08e0ae8e84c7a6a059bb06b04a9a44dc372a (from 0.11)
more whitespace cleanup