Merge pull request #8935 from cividesk/CRM-19261-4.6
authorEileen McNaughton <eileen@mcnaughty.com>
Sat, 27 Aug 2016 03:23:49 +0000 (15:23 +1200)
committerGitHub <noreply@github.com>
Sat, 27 Aug 2016 03:23:49 +0000 (15:23 +1200)
CRM-19261: full fix


Trivial merge