Fix upstream merge conflict on 7b53eca926d5
Merging upstream commit 7b53eca926d5 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 7fb0ef11200f5b277207d9b9d278552a877a25cf && \
hg topic upstream-merge && \
hg merge 7b53eca926d52203953288e3604b2f2e5ef987eb