Merge pull request #1238 in master
Update zend.input-filter.file-input.rst
Merge pull request #1239
Merge pull request #1239 in develop