Do not b**ch about mktemp in .git dir
Merge branch 'master' into journal

Conflicts:
	check-tempfiles.sh