Fix upstream merge conflict on d5806c40f508
Merging upstream commit d5806c40f508 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 fdb29ced0fcb7dd9be3ce7255bc16e7e74d2cc4b && \
hg topic upstream-merge && \
hg merge d5806c40f508f425ff9c7857686c51169e47bb95