Fix upstream merge conflict on 5e0df936f063
Merging upstream commit 5e0df936f063 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 31ecc7d6c90b6f7dbf86b7aa89cc3740dd6273c6 && \
hg topic upstream-merge && \
hg merge 5e0df936f063401540c0199fa2c6dbf01f9759b2