Merge branch 'mr/mark-i18n-log-rerere'