Preparations for Django 1.7