[Issue #831] Fix for OperationJoin race condition
Merge pull request #832 from duncani/fixes

[Issue #831] Fix for OperationJoin race condition