Merge pull request #1744 from davecivicrm/CRM-13442b