Renamed ValidationError to ObjectValidationError
Merge commit 'e3635a573ec91a135b37a08cde811231cb15907c'