CRM-12519
Merge pull request #651 from demeritcowboy/misc4.3

CRM-12519