Merge branch 'ph/stash-rerere' into maint-1.7.11