Update to support django 1.6