Merge pull request #3064 from davecivicrm/CRM-14361