coding style fixes
more coding style fixes
merge 227215c243d4357eaf1bce27a5cb79e71c93354a to 690e193369d10ad3b5561d26343578cefc09f738 (from 0.11)