Merge pull request #17878 from civicrm/5.28
authorEileen McNaughton <emcnaughton@wikimedia.org>
Fri, 17 Jul 2020 22:40:31 +0000 (10:40 +1200)
committerGitHub <noreply@github.com>
Fri, 17 Jul 2020 22:40:31 +0000 (10:40 +1200)
5.28


Trivial merge