From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri, 26 Aug 2016 02:41:21 +0000 (+1200)
Subject: Merge pull request #8932 from seamuslee001/CRM-15925
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=576dd92b9c8a832aa9a5bb7b03398f7730dd89dc;p=civicrm-core.git

Merge pull request #8932 from seamuslee001/CRM-15925

CRM-15925 4.6 Backport
---

576dd92b9c8a832aa9a5bb7b03398f7730dd89dc