Fix upstream merge conflict on af11741a242b
Merging upstream commit af11741a242b 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 69048135ac5e71f3d7cfb1c5d3fe6ca30947138d && \
hg topic upstream-merge && \
hg merge af11741a242b1a84911e81783c68d3b73a4eabda