Code

Merge branch 'ph/rerere-doc' into maint-1.7.8