From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 15 Jul 2021 20:57:34 +0000 (+1200)
Subject: Merge pull request #20860 from civicrm/5.40
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0a7b86717573ed909202ca4d7fa248bbad203971;p=civicrm-core.git

Merge pull request #20860 from civicrm/5.40

5.40 to master
---

0a7b86717573ed909202ca4d7fa248bbad203971