whitespace cleanup
merged 20dc5f25d3de85c2aea9f7a434f3d923a337a74c...513913886ac2068bd768a356c3250cf126592680 (from 0.11)
more whitespace cleanup