Merge pull request #2564 from jaapjansma/CRM-14276