Merge pull request #5166 from colemanw/CRM-15705