Merge pull request #18666 from civicrm/5.30
authorEileen McNaughton <emcnaughton@wikimedia.org>
Fri, 2 Oct 2020 22:01:17 +0000 (11:01 +1300)
committerGitHub <noreply@github.com>
Fri, 2 Oct 2020 22:01:17 +0000 (11:01 +1300)
5.30 to master


Trivial merge