Fix upstream merge conflict on 23d761af090c
Merging upstream commit 23d761af090c 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 b44800e8b83fcb58fbed6012c6036920da047414 && \
hg topic upstream-merge && \
hg merge 23d761af090caf07e3891c948e4f69e60667c2b9