Restore context to CRM.api CRM-12029
Merge pull request #72 from colemanw/CRM-12029

Restore context to CRM.api CRM-12029