Add the git-timemachine package
Merge branch 'master' into personal-fork