Fixed issue #3626
Merge branch 'hotfix/4140'

Close #4140
Merge pull request #4143 from wryck7/fix/3626

Fixed issue #3626
Merge branch 'hotfix/4143' into develop

Forward port #4143

Conflicts:
	library/Zend/Form/View/Helper/FormRow.php