Merge branch '20151231_indent' of https://github.com/fperrad/dropbear into fperrad-20151231_indent