Fix upstream merge conflict on 76f0e5e6b975
Merging upstream commit 76f0e5e6b975 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 21cdb4f4bff03616177f3dfafbd6e2fcceef3112 && \
hg topic upstream-merge && \
hg merge 76f0e5e6b9753548aa83905d375bd7175dbf15bc