Merge branch 'jc/maint-fix-mailinfo-strip' into maint