Fix @Reuse to always use the function pointers of the current class
Merge remote-tracking branch 'upstream/master' into travis-osx