Synchronising with latest changes in zf2