Merge pull request #14669 from civicrm/5.15
authorEileen McNaughton <emcnaughton@wikimedia.org>
Fri, 28 Jun 2019 22:18:11 +0000 (10:18 +1200)
committerGitHub <noreply@github.com>
Fri, 28 Jun 2019 22:18:11 +0000 (10:18 +1200)
5.15


Trivial merge