From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 29 Nov 2019 08:34:26 +0000 (+1300)
Subject: Merge pull request #15985 from seamuslee001/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=4a97c2545d7398f57639913c658b06e3241b262a;p=civicrm-core.git

Merge pull request #15985 from seamuslee001/master

5.20 port to master
---

4a97c2545d7398f57639913c658b06e3241b262a