Merge pull request #11180 from jackrabbithanna/CRM-21022
authorMark Hanna <mark@skvare.com>
Sun, 22 Oct 2017 02:26:53 +0000 (21:26 -0500)
committerGitHub <noreply@github.com>
Sun, 22 Oct 2017 02:26:53 +0000 (21:26 -0500)
CRM-21022 backport for 4.6


Trivial merge