Fix upstream merge conflict on a29c90e456b7
Merging upstream commit a29c90e456b7 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 2d576f4657434953e8f63e9273dfbee184cfac07 && \
hg topic upstream-merge && \
hg merge a29c90e456b7c5c2cc2b9318053b0034d91d75e7