Code

Merge branch 'ph/rerere-doc' into maint