Allow adding error message for specified field
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/py3
Remove dependency on uuidfield and pytz
Test with py.test
Clean-up