From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Sun, 12 Aug 2018 23:08:59 +0000 (+1200)
Subject: Merge pull request #12648 from civicrm/5.5
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=026bd2e3e3debee7c842a01c2daaf883ec855a5b;p=civicrm-core.git

Merge pull request #12648 from civicrm/5.5

5.5 to master
---

026bd2e3e3debee7c842a01c2daaf883ec855a5b