From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 10 Aug 2020 19:53:31 +0000 (+1200)
Subject: Merge pull request #18117 from mattwire/529_master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b293471c56db5454e24b5bd5f57d517e914ab539;p=civicrm-core.git

Merge pull request #18117 from mattwire/529_master

5.29 to master
---

b293471c56db5454e24b5bd5f57d517e914ab539