Merge pull request #9795 from h-c-c/4.6-CRM-19945
authorMark Hanna <mark@skvare.com>
Sun, 24 Sep 2017 18:16:19 +0000 (13:16 -0500)
committerGitHub <noreply@github.com>
Sun, 24 Sep 2017 18:16:19 +0000 (13:16 -0500)
fix and test for CRM-19945 in 4.6


Trivial merge