changed django1.6 #4