Merge branch 'hb/git-pm-tempfile'