From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 2 Oct 2019 05:46:41 +0000 (+0800)
Subject: Merge pull request #15372 from civicrm/5.18
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ee585fd716138c1b015f8e06858f0ee4f76dda34;p=civicrm-core.git

Merge pull request #15372 from civicrm/5.18

5.18
---

ee585fd716138c1b015f8e06858f0ee4f76dda34