From: Mark Hanna <mark@skvare.com>
Date: Sat, 21 Oct 2017 22:45:43 +0000 (-0500)
Subject: Merge pull request #11177 from jackrabbithanna/CRM-21123
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e8378e726ff06a91ffce35db73fc3dc7cc880cd5;p=civicrm-core.git

Merge pull request #11177 from jackrabbithanna/CRM-21123

backport to 4.6 for CRM-21123
---

e8378e726ff06a91ffce35db73fc3dc7cc880cd5