Merge pull request #15387 from eileenmcnaughton/merge
authorEileen McNaughton <emcnaughton@wikimedia.org>
Fri, 4 Oct 2019 04:05:22 +0000 (06:05 +0200)
committerGitHub <noreply@github.com>
Fri, 4 Oct 2019 04:05:22 +0000 (06:05 +0200)
Merge 5.18 to master


Trivial merge