merge in patch from tim golden to fix contextmanager support for mp.Lock()
4 files changed