Adds support for Django 1.6 w/o breaking older versions