Merge pull request #4283 from davecivicrm/CRM-15380