Merge branch 'fc/git-complete-helper' into fc/git-prompt-script