Merge pull request #4425 from colemanw/CRM-15476