Merge pull request #15256 from civicrm/5.18
authorEileen McNaughton <emcnaughton@wikimedia.org>
Tue, 10 Sep 2019 03:39:47 +0000 (15:39 +1200)
committerGitHub <noreply@github.com>
Tue, 10 Sep 2019 03:39:47 +0000 (15:39 +1200)
5.18


Trivial merge