Merge branch 'i18n-label-first-strip-reply-to' into 'master'