Let the Environment override the Context

closes #404
4 files changed