Fix upstream merge conflict on a9f0f4bfc6e9
Merging upstream commit a9f0f4bfc6e9 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 109102720ffec629b304a858d402a6e2cd2600ad && \
hg topic upstream-merge && \
hg merge a9f0f4bfc6e9e0728d1f3bf9d1b7cf8b2594e81b