Merge pull request #17369 from civicrm/5.26
authorEileen McNaughton <emcnaughton@wikimedia.org>
Wed, 20 May 2020 19:29:37 +0000 (07:29 +1200)
committerGitHub <noreply@github.com>
Wed, 20 May 2020 19:29:37 +0000 (07:29 +1200)
5.26 to master


Trivial merge