This PR needs dev-master of PHPCR-ODM -- how should we handle that?