Fix upstream merge conflict on 26de9a6cf3d1
Merging upstream commit 26de9a6cf3d1 gives a conflict.
A human being has to perform merge and resolution for the automatic merge process to resume.
Command for clean conflict reproduction:
hg pull
hg --config command.update.check=abort update e67b946233ce59306090bf1a2594443540f39f95 && \
hg topic upstream-merge && \
hg merge 26de9a6cf3d1446d5147be2f78a94f31a0756e2f