Merge pull request #1214 from davecivicrm/CRM-12788