CRM-13550 honestly I think I have it this time
Merge pull request #47 from eileenmcnaughton/CRM-13550

CRM-13550 honestly I think I have it this time