fix for DDC-2599
Merge branch 'master' of github.com:samvdb/doctrine2