From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 18 Jun 2021 23:58:19 +0000 (+1200)
Subject: Merge pull request #20666 from civicrm/5.39
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=254ae8f7bd383d796deef90966b003f091bc90fd;p=civicrm-core.git

Merge pull request #20666 from civicrm/5.39

5.39 to master
---

254ae8f7bd383d796deef90966b003f091bc90fd