Well, my general line for pvpgn is to make something workable from several branches, getting different files from different branches and updating something myself.
It should take several months as i see.
So, your patch have to be moved to future versions, manual copying lines from one file to another.
I'll send it to you to try it now.