Merge pull request #11174 from jackrabbithanna/CRM-21006
authorMark Hanna <mark@skvare.com>
Sat, 21 Oct 2017 21:00:51 +0000 (16:00 -0500)
committerGitHub <noreply@github.com>
Sat, 21 Oct 2017 21:00:51 +0000 (16:00 -0500)
CRM-21006 4.6 backports


Trivial merge