CRM-13550 improve handling of options
Merge pull request #44 from eileenmcnaughton/CRM-13550

CRM-13550 improve handling of options