Django 1.7 compatible changes