Patch for Django 1.5 custom User models
Compatibility for master merge