Fix upstream merge conflict on b229ea89d4b7
Merging upstream commit b229ea89d4b7 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 ccf18b4e31532d0154b7def8716ff4e9b32aff64 && \
hg topic upstream-merge && \
hg merge b229ea89d4b78957df5ae7f9900e2431f673a0e5