Merge pull request #10411 from jackrabbithanna/CRM-20159
authorMark Hanna <mark@skvare.com>
Mon, 12 Jun 2017 01:29:10 +0000 (20:29 -0500)
committerGitHub <noreply@github.com>
Mon, 12 Jun 2017 01:29:10 +0000 (20:29 -0500)
CRM-20159 backport for 4.6


Trivial merge