From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 21 Sep 2021 04:38:05 +0000 (+1200)
Subject: Merge pull request #21561 from civicrm/5.42
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b3e1d54c7014db6096ca32888728cf9427df9731;p=civicrm-core.git

Merge pull request #21561 from civicrm/5.42

5.42 to master
---

b3e1d54c7014db6096ca32888728cf9427df9731