Fix upstream merge conflict on d6ef4b5db702
Merging upstream commit d6ef4b5db702 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 20037f5aa7fb6b0fcefd6d03ddf55a6db1f7cba7 && \
hg topic upstream-merge && \
hg merge d6ef4b5db702797c6beb870b3d70b3bbe60fda08