From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Wed, 8 Jun 2016 05:08:10 +0000 (-0600)
Subject: Merge pull request #8530 from seamuslee001/CRM-18772-46
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cd57b521821d3eab2bea71d39a0217468ad8899d;p=civicrm-core.git

Merge pull request #8530 from seamuslee001/CRM-18772-46

CRM-18772 46 backport
---

cd57b521821d3eab2bea71d39a0217468ad8899d