Merge branch 'hotfix/867'

Close #867
Zend Framework 2.2.0
Merge branch 'releases/2.2.0' into develop

2.2.0 readiness

Conflicts:
	docs/languages/en/conf.py