Merge branch 'ks/rfc2047-one-char-at-a-time' into maint