Altered how the function name is returned so that the declaring class is returned not the class that the method is found in. This allows methods from child classes to be more easily located.
Merge remote-tracking branch 'origin/master'