code style fixes
ported fab6465b0203ff8f8ccff2263b162b3feea59185...77b1679d4b62a771551a51df753a875be1a04089 (from 0.11)
coding style fixes