CRM-12519

CRM-12519
I think I git'd it right - this is intended against 4.3