From: Mark Hanna <mark@skvare.com>
Date: Mon, 12 Jun 2017 01:29:10 +0000 (-0500)
Subject: Merge pull request #10411 from jackrabbithanna/CRM-20159
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c9f603ca53404a6acc40da126d88eeef885efe90;p=civicrm-core.git

Merge pull request #10411 from jackrabbithanna/CRM-20159

CRM-20159 backport for 4.6
---

c9f603ca53404a6acc40da126d88eeef885efe90