Full fix
Merge pull request #1989 from cividesk/CRM-13763

CRM-13763