From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu, 19 Jul 2018 21:14:52 +0000 (+1200)
Subject: Merge pull request #12515 from civicrm/5.4
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a74efcfee1eef141e69cb1072db5b3c2b253208b;p=civicrm-core.git

Merge pull request #12515 from civicrm/5.4

5.4 to master
---

a74efcfee1eef141e69cb1072db5b3c2b253208b