Fix upstream merge conflict on c0a24107fb17
Merging upstream commit c0a24107fb17 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 c626ef64e1ccc826f6225caa350f3b0f10765416 && \
hg topic upstream-merge && \
hg merge c0a24107fb17ae2bb7be84499ab16512cf8aad14