defaults removed from django 1.6
Merge branch 'resolve-import-1.6'

* resolve-import-1.6:
  defaults removed from django 1.6