Completed section 6.2 for validations
Merge branch 'master' into model_users