Fix conflict on django 1.7.