Merge branch 'lh/git-file'