From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed, 29 Aug 2018 00:49:59 +0000 (+1200)
Subject: Merge pull request #12743 from civicrm/5.5
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=22cae9c16b7d4a67b02c64729a34efc1fad41760;p=civicrm-core.git

Merge pull request #12743 from civicrm/5.5

5.5 to master
---

22cae9c16b7d4a67b02c64729a34efc1fad41760