Bugfix for Django 1.6
Merge pull request #305 from SkyTruth/master

Bugfix for Django 1.6.