Fix upstream merge conflict on 26ede07ae882
Merging upstream commit 26ede07ae882 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 f4d89689b77187d8401ce4022ce44301e95ba510 && \
hg topic upstream-merge && \
hg merge 26ede07ae8825c5ed713ae26eb583b94f5d6a455