Improved support for django 1.5