Merge branch 'kn/cat-file-literally' into next