Merge pull request #2028 from davecivicrm/CRM-13786