Fix upstream merge conflict on f537a011a76f
Merging upstream commit f537a011a76f 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 ee45e97eb126ab120f4ef71d11b025c07a1734fa && \
hg topic upstream-merge && \
hg merge f537a011a76f06c46cadd5c8014ca762310ea91f