WIP: Work in progress support for django 1.7