Django 1.6

closes #741