[ros-diffs] [CVS reactos] Merge back commit from winehq