Prepare for Django 1.6