Commented out user roles require
Merge branch 'refs/heads/develop'

* refs/heads/develop:
  Commented out user roles require