Rely on a zf2 fork until the PRs are merged
Add timeout support