Fix upstream merge conflict on 759b8e599a5a
Merging upstream commit 759b8e599a5a 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 759b8e599a5ac516ded765917817263370877ff9