Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint