Merge branch 'pw/rerere-autoupdate'