code style fixes
merge 55aaa7b95209981d17d002899179592e14b92502...ecf913e6c979d3064361b9d83a14bd91d8c9e4ab (from 0.11)
code style fixes
even more code style fixes