fix for django 1.6
Merge remote-tracking branch 'origin/master'