Fix upstream merge conflict on 11c7e0f4b13a
Merging upstream commit 11c7e0f4b13a 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 upstream-merge && \
hg topic upstream-merge && \
hg merge 11c7e0f4b13a06066ee87e85cfa6bf529f654017