more changes required for Django 1.6.2