Closes #6086
Merge branch 'hotfix/6086'

* hotfix/6086:
  move individual function into data provider instead
  Fixes #6082
Fix: No need to prefix imports
Merge branch 'cs/#5029-imports-fqcn-not-prefixed-with-global-ns'

Close #5029
Merge branch 'cs/#5029-imports-fqcn-not-prefixed-with-global-ns' into develop

Close #5029
Forward Port #5029
Fix: Test name
Fix: Indentation
Fix: Trailing comma in array initialization
Merge pull request #6139 from localheinz/bugfix/test-name

Fix: Test name
Merge branch 'hotfix/6139'

Close #6139
Merge branch 'hotfix/6139' into develop

Forward port #6139
Merge pull request #6140 from localheinz/bugfix/indentation

Fix: Indentation in array initialization, trailing commas
Merge branch 'hotfix/6140'

Close #6140
Merge branch 'hotfix/6140' into develop

Forward port #6140
Adding tests/fixes for possible XSS injections in view helpers

Signed-off-by: Marco Pivetta <ocramius@gmail.com>
[ZF2014-03] Added detail to README.md
Merge branch 'security/zf2014-03'

ZF2014-03 fixes
Merge branch 'security/zf2014-03' into develop

ZF2014-03 fixes
[2.3.1] Release readiness

- Updated README with version, date, and changelog
- Updated CHANGELOG with 2.3.1 and 2.2.7 details
- Updated version constant to 2.3.1
Merge branch 'releases/2.3.1'

2.3.1 release readiness
Merge branch 'releases/2.3.1' into develop

2.3.1 release readiness

Conflicts:
	README.md
	library/Zend/Version/Version.php