It's 2013
Merge branch 'feature/form-view-helper' into develop

Close #3255
Merge branch 'feature/nested-error-handler' of git://github.com/marc-mabe/zf2 into feature/log-nested-handlers
Merge branch 'feature/log-nested-handlers' into develop

Close #3257
Merge branch 'hotfix/3260' into develop

Forward port #3260
Merge branch 'hotfix/3261' into develop

Forward port #3261
Merge branch 'consoleresponsefix' of git://github.com/H3DAZ/zf2 into hotfix/3263
Merge branch 'hotfix/3263' into develop

Close #3263
Merge branch 'hotfix/3328' into develop

Forward port #3328
Added missing Exception namespace to Sha1 validator
Add test for Translator
Merge branch 'hotfix/3081' into develop

Forward port #3081

Conflicts:
	library/Zend/Form/Element/Collection.php
	tests/ZendTest/Form/Element/CollectionTest.php
else isn't needed, as the previous block returns on completion + removed call to strlen if length of padding is less than or equal 0
StringWrapper::convert() Renamed second argument  to  and fixed phpdoc
Merge branch 'master' of git://github.com/neilime/zf2 into hotfix/3262
phpdoc
Merge branch 'hotfix/3262' into develop

Close #3262
Merge branch 'hotfix/3272' into develop

Forward port #3272
Added missing @deprecated
The native string wrapper doesn't support to convert between encodings