Django 1.6 fix
Merge pull request #1 from mkieblesz/master

Django 1.6 fix