Merge pull request #1 from zendframework/master

Latest zf2