Fix upstream merge conflict on d65b8437314a
Merging upstream commit d65b8437314a 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 3594eb57a00089a7cd291f5b13f0f96e0bd0a85d && \
hg topic upstream-merge && \
hg merge d65b8437314aab0072ae7d82b04d8baca80f9ecc