Full fix, backport of https://fisheye2.atlassian.com/changelog/CiviCRM?cs=44917
Merge pull request #37 from cividesk/CRM-11696

Full fix for CRM-11696