Forgot to import NOOrganizationNumberField, ops
Merge branch 'small-fixes' into travis-test