Back port from zf2/master