Merge "Fix quoted-printable encoding of e-mail addresses" into stable-2.9