Merge pull request #2181 from davecivicrm/CRM-13919a