Compatibility with Django 1.6
Merge pull request #1 from markfinger/master

Compatibility with Django 1.6