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
Merge branch 'master' of github.com:Thinkscape/zf2
Rename "SimpleTestTest" to "SimpleTest".
Fix #4315 - Console routes with dashes are not understood.
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' into develop

Forward port #4317