Add my pending-review patch for invoking patchpoints

Will get rid of it once it's merged upstream
Merge remote-tracking branch 'upstream/master' into cmake
Forgot to include this part
Merge remote-tracking branch 'upstream/master' into cmake