Merge pull request #17459 from civicrm/5.26
authorEileen McNaughton <emcnaughton@wikimedia.org>
Tue, 2 Jun 2020 00:41:20 +0000 (12:41 +1200)
committerGitHub <noreply@github.com>
Tue, 2 Jun 2020 00:41:20 +0000 (12:41 +1200)
5.26 to master


Trivial merge