Merge pull request #10194 from AdmiralCurtiss/riivolution-edge-cases Fix some Riivolution file patching edge cases.
