Bug fix: Merging change from upstream:
https://commons.wikimedia.org/w/index.php?diff=112317524