Changes for Django 1.6 compatibilty