Add environ argument to methods called by plugin.
Removes environ argument from method not called by plugin.
Merge branch 'master' into patch-1