Throw ValidationError instead of ValueError
Merge branch 'master' of github.com:bradjasper/django-jsonfield