whitespace fixes
merge 1f1d7af6fc13ff42a8a717d4a48ed0adfa725713...3ab1a7de8c300e648603e4321544b4a7583179c6 (from 0.11)