Fix upstream merge conflict on c24af3002f7d
Merging upstream commit c24af3002f7d 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 3be41a742a8e05348dc6677aab8aed3208ca5872 && \
hg topic upstream-merge && \
hg merge c24af3002f7d8fe1938eab9aa9b921687a435537