Merge pull request #4385 from colemanw/CRM-15484