Django >= 1.6 support
Merge pull request #1 from llonchj/patch-1

Django >= 1.6 support