Change context-var to block-scoped-var
Merge pull request #340 from mduvall/change-context-var-to-block-scoped

Change context-var to block-scoped-var (fixes #339)