From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Thu, 19 May 2016 09:29:16 +0000 (+1200)
Subject: Merge pull request #8395 from monishdeb/CRM-18405
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=78087d5c5788337bd250dea48e2606cc533bbd5e;p=civicrm-core.git

Merge pull request #8395 from monishdeb/CRM-18405

CRM-18405: Backport master fix
---

78087d5c5788337bd250dea48e2606cc533bbd5e