Merge branch 'hs/simplify-bit-setting-in-fsck-tree'