Merge pull request #1736 from davecivicrm/CRM-13483