Merged requested to merge bitbucket/merged-pr-248 into branch/2.5
Created originally on Bitbucket by jdufresne (Jon Dufresne)
Was already merged in Bitbucket before import, marked as merged by the import user
The removed files are unused by tests and have zero references in the code. Can safely remove them and reduce the size of the package.