From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 5 May 2021 22:32:28 +0000 (+1000)
Subject: Merge pull request #20232 from totten/merge-master-5.37
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a92b526aeef1d7a8042f4828af1f3ade04272cee;p=civicrm-core.git

Merge pull request #20232 from totten/merge-master-5.37

Merge forward (5.37 => master)
---

a92b526aeef1d7a8042f4828af1f3ade04272cee