Merge pull request #1219 in master
Update zend.mail.file.options.rst
Merge pull request #1220
Merge pull request #1220 in develop