Merge branch 'jc/rerere-multi'