Merge pull request #15351 from civicrm/5.18
authorTim Otten <totten@civicrm.org>
Fri, 27 Sep 2019 04:22:17 +0000 (21:22 -0700)
committerGitHub <noreply@github.com>
Fri, 27 Sep 2019 04:22:17 +0000 (21:22 -0700)
5.18


Trivial merge