Work in progress on Django 1.6 compat