Handle Django 1.6 import issue, fixes #170
Merge pull request #172 from camilonova/patch-3

Handle Django 1.6 import issue, fixes #170