WH-27 - Port from ZF 2.0.6 to ZF 2.1.1