From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 4 Oct 2019 04:05:22 +0000 (+0200)
Subject: Merge pull request #15387 from eileenmcnaughton/merge
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9b970fbd441475689ae61a3567f646d651026368;p=civicrm-core.git

Merge pull request #15387 from eileenmcnaughton/merge

Merge 5.18 to master
---

9b970fbd441475689ae61a3567f646d651026368