'Fixed' problem with course enrollment -> users association.
Merged with master