From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri, 22 Feb 2019 00:47:16 +0000 (+1300)
Subject: Merge pull request #13661 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fec6098a316500c2e29a625c5dadc960bf25b7b7;p=civicrm-core.git

Merge pull request #13661 from eileenmcnaughton/master

5.11 to master
---

fec6098a316500c2e29a625c5dadc960bf25b7b7