Merge branch 'jk/write-broken-index-with-nul-sha1'