Merge pull request #15985 from seamuslee001/master
authorEileen McNaughton <emcnaughton@wikimedia.org>
Fri, 29 Nov 2019 08:34:26 +0000 (21:34 +1300)
committerGitHub <noreply@github.com>
Fri, 29 Nov 2019 08:34:26 +0000 (21:34 +1300)
5.20 port to master


Trivial merge