sesman: hand merge #176 from v0.6 branch, indent changes