Allow for Django 1.5 and 1.6