Fix upstream merge conflict on 81960a1a98c9
Merging upstream commit 81960a1a98c9 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 d075a44e8211652829b3ec39725a69b0e6f20094 && \
hg topic upstream-merge && \
hg merge 81960a1a98c97b2214568c751e8ae0abd504601f