Make g/gi use git grep when possible.
Merge branch 'master' into leo-work