Merge pull request #11177 from jackrabbithanna/CRM-21123
authorMark Hanna <mark@skvare.com>
Sat, 21 Oct 2017 22:45:43 +0000 (17:45 -0500)
committerGitHub <noreply@github.com>
Sat, 21 Oct 2017 22:45:43 +0000 (17:45 -0500)
backport to 4.6 for CRM-21123


Trivial merge