django 1.6 compatibility fix
Merge pull request #1 from uNdimka/master

django 1.6 compatibility fix