Merge branch 'fc/git-complete-helper-fix'