stack_context deactivation support
Unnecessary import removed
Parameter is no longer necessary
Merge remote-tracking branch 'mrjoes/master' into merge
Add a stack_context benchmark.