Merge pull request #17931 from civicrm/5.28
authorEileen McNaughton <emcnaughton@wikimedia.org>
Thu, 23 Jul 2020 22:45:30 +0000 (10:45 +1200)
committerGitHub <noreply@github.com>
Thu, 23 Jul 2020 22:45:30 +0000 (10:45 +1200)
5.28 to master


Trivial merge