Merge branch 'cat-file-compat'