From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu, 20 Sep 2018 22:50:47 +0000 (+1200)
Subject: Merge pull request #12852 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=590043901b70e54bbadf79d1f909438820900785;p=civicrm-core.git

Merge pull request #12852 from eileenmcnaughton/master

5.6 to Master
---

590043901b70e54bbadf79d1f909438820900785