Merge pull request #14677 from civicrm/5.15
authorEileen McNaughton <emcnaughton@wikimedia.org>
Sat, 29 Jun 2019 23:52:53 +0000 (11:52 +1200)
committerGitHub <noreply@github.com>
Sat, 29 Jun 2019 23:52:53 +0000 (11:52 +1200)
5.15 to master


Trivial merge