Fix upstream merge conflict on f07b0ad546ac
Merging upstream commit f07b0ad546ac 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 1def64cc331e5bbc6409ae66fe3a83fb7a982758 && \
hg topic upstream-merge && \
hg merge f07b0ad546acaf06c4c1a9345385055aeb182cb6