Merge branch 'jc/maint-rerere-in-workdir'