From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 15 Nov 2016 21:05:29 +0000 (+1300)
Subject: Merge pull request #9394 from seamuslee001/CRM-18493-46
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9a7753a5778a6ff3869611487eae424fb678fa04;p=civicrm-core.git

Merge pull request #9394 from seamuslee001/CRM-18493-46

Backport of CRM-18493
---

9a7753a5778a6ff3869611487eae424fb678fa04