Merge branch 'REL1_24' of https://gerrit.wikimedia.org/r/p/mediawiki/core into REL1_24