Merge pull request #15372 from civicrm/5.18
authorEileen McNaughton <emcnaughton@wikimedia.org>
Wed, 2 Oct 2019 05:46:41 +0000 (13:46 +0800)
committerGitHub <noreply@github.com>
Wed, 2 Oct 2019 05:46:41 +0000 (13:46 +0800)
5.18


Trivial merge