Fix upstream merge conflict on 264f16f60483
Merging upstream commit 264f16f60483 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 62137a458a1c72a82bd19cb60141e5fa1c4399eb && \
hg topic upstream-merge && \
hg merge 264f16f6048302f3fcc684836a978076b0ae92b4