Merge pull request #15237 from civicrm/5.18
authorEileen McNaughton <emcnaughton@wikimedia.org>
Sat, 7 Sep 2019 00:57:55 +0000 (12:57 +1200)
committerGitHub <noreply@github.com>
Sat, 7 Sep 2019 00:57:55 +0000 (12:57 +1200)
5.18


Trivial merge