Allow a model instance to have custom roles
Merge branch 'instance-roles' into jokull

* instance-roles:
  Allow a model instance to have custom roles