Merge pull request #5569 from cividesk/CRM-16239-4.6