Merge pull request #1001 in master
Merge pull request #1002 in master
Updated content structure in Zend\Text
Merge pull request #1012
Merge pull request #1012 in develop