Merge branch 'jc/rerere-autoupdate-doc'