See individual commit messages for details. --- Originally posted by @glensc at https://github.com/zendframework/zend-mail/pull/231