deal with custom user models (for django >= 1.5) and detect whether cache backend is being used
Merge remote-tracking branch 'origin/master'