Merge pull request #2646 from ludovic-henry/fix-processwatch-dispose