Update for Django 1.7 without breaking old version