Updates from doctrine/couchdb-odm