Added django 1.6 compatibility imports