CRM-15242 - Resubmit PR #4103
Merge pull request #4209 from colemanw/CRM-15242

CRM-15242 - Resubmit PR #4103