CRM-15317: full fix
Merge pull request #4191 from cividesk/CRM-15317

CRM-15317: full fix