Merge pull request #2576 from ludovic-henry/referencesource-process