From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 14 Jan 2020 04:37:40 +0000 (+1300)
Subject: Merge pull request #16288 from civicrm/5.22
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8001adaf6ac16b4e0f5d71e71f5c77d3e680b8c3;p=civicrm-core.git

Merge pull request #16288 from civicrm/5.22

5.22 to master
---

8001adaf6ac16b4e0f5d71e71f5c77d3e680b8c3