Add the git-timemachine package
Merge remote-tracking branch 'upstream/master'