Merge pull request #2245 from davecivicrm/CRM-13945