whitespace fixes
merge 2557b8cad38959459d86c0f027b4e43fb80d74e9 to 77d7e73f75681a36c469af5fc8c4fd5fa029fa95 (from 0.11)