Django 1.7 port
Merge branch 'master' of https://github.com/kriberg/Turan