Work in progress (also updated the ZF2 library to 2.1.15)