Merge (import git-subtree-merge from ~/bin)
git-find-blob: remove Py3 annotations
git-find-blob: make compatible with Python 2