From: colemanw <coleman@civicrm.org>
Date: Tue, 2 Aug 2016 15:32:24 +0000 (-0400)
Subject: Merge pull request #8800 from JMAConsulting/CRM-16189-17
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e5fcc24b376a543d9a0425d5cbadd6842db6d8da;p=civicrm-core.git

Merge pull request #8800 from JMAConsulting/CRM-16189-17

Backport CRM-16189-17 into 4.7.10
---

e5fcc24b376a543d9a0425d5cbadd6842db6d8da