One fix quick done: https://github.com/zendframework/zf2/pull/4235