Fix upstream merge conflict on ad3f49b68b60
Merging upstream commit ad3f49b68b60 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 ad3f49b68b601557fa0064a7348cce2f60985e97