Merge pull request #1665 from davecivicrm/CRM-13231