Fix upstream merge conflict on 0593e5e47cff
Merging upstream commit 0593e5e47cff 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 4f94fdad8c69df72cf0e531ee7f3fc5daf721bc5 && \
hg topic upstream-merge && \
hg merge 0593e5e47cff77470842daa50d390c00d2a0811f