Merge pull request #4523 from colemanw/CRM-15524