Merged with doctrine_zf2_integration branch