Merge pull request #3226 from davecivicrm/CRM-13981a