Fix upstream merge conflict on 6d593ca6f557
Merging upstream commit 6d593ca6f557 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 6d593ca6f5570b9e97bc78a0c35ea362fbbd846f