Merge branch 'sg/rerere-cleanup'