Fixed the function definition to match the docblock
Merge pull request #5181 from GrahamCampbell/4.2-helpers

[4.2] Additional Helper Fixes
Simplify ClassLoader
Fix conflicts.