Support Custom User models.
Merge remote-tracking branch 'gundl/master'