Merge branch 'patch-1' of https://github.com/glen-84/zf2 into PR-5276

* 'patch-1' of https://github.com/glen-84/zf2:
  Add "role" to $validGlobalAttributes
Merge pull request #5285 in develop
Merge commit 'c1a7be6c3a7a35c8f5ad5fb286df15537f261d95' into develop

Conflicts:
	library/Zend/Memory/composer.json
add html escape by default
update phpdoc