Merge pull request #11178 from jackrabbithanna/CRM-20895
authorMark Hanna <mark@skvare.com>
Sat, 21 Oct 2017 22:46:29 +0000 (17:46 -0500)
committerGitHub <noreply@github.com>
Sat, 21 Oct 2017 22:46:29 +0000 (17:46 -0500)
backported fix for CRM-20895


Trivial merge