Fix upstream merge conflict on 829ec3ae74a5
Merging upstream commit 829ec3ae74a5 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 009e55c633d8b46edb3d7d791b24c5f43c12b320 && \
hg topic upstream-merge && \
hg merge 829ec3ae74a5ed15cce00cc5447e2d1408669fb8