Merge branch 'mr/rerere-crash-fix'