Merge pull request #17417 from eileenmcnaughton/ev
authorEileen McNaughton <emcnaughton@wikimedia.org>
Fri, 29 May 2020 00:42:57 +0000 (12:42 +1200)
committerGitHub <noreply@github.com>
Fri, 29 May 2020 00:42:57 +0000 (12:42 +1200)
[REF] Preliminary cleanup for #17339


Trivial merge