Merge branch 'master' of git://github.com/zendframework/zf2
Merge branch 'master' of git://github.com/zendframework/zf2
Merge branch 'master' of github.com:Thinkscape/zf2
Merge branch 'master' of github.com:Thinkscape/zf2
remove extra semicolon
update docblock for ZendTest/Db/* files
update docblock for ZendTest/Code,Di,Log, Mvc/*  files
Merge branch 'master' of github.com:Thinkscape/zf2
Rename "SimpleTestTest" to "SimpleTest".
Merge pull request #4301 from garygolden/fix/typo

remove extra semicolon
Merge branch 'hotfix/4301'

Close #4301
Fix #4315 - Console routes with dashes are not understood.
Merge pull request #4313 from samsonasik/update/docblock

update docblock for ZendTest : /Db/*, /Code/* , /Di/*, /Log/*, Mvc/*
Merge branch 'hotfix/4313'

Close #4313
Merge pull request #4317 from Thinkscape/hotfix/console-dashed-routes

Fix #4315 - Console routes with dashes are not understood.
Merge branch 'hotfix/4317'

Close #4317
Fixes #4315
[#4284] Mark ext/intl as suggested only

- Marking as required in the framework makes it impossible to install
  the full ZF2 distribution when ext/intl is not available.
- Based on discussion in #4284, both zf2 and zend-i18n composer.json
  files should be in sync; otherwise, full zf2 will be installed if
  ext/intl is not available when attempting to install zend-i18n.
- Updated all code to raise a new "ExtensionNotLoadedException" when
  ext/intl is required but not detected.
Fix annotations

- `s/InvalidArgument/ExtensionNotLoaded/` in `@throws` annotations
Move ext/intl check to new constructor

- per @DASPRiD
Throw exception inside getLocale()

- instead of __construct, as ext/intl is only needed if no locale is
  explicitly set.