coding style fixes
more coding style fixes
merge f347a1214bb819ae25de92decac0441e9d70bfa7...b18b2459a2ca6c2a42a91ca29c51cc92ab4f694a (from 0.11)