[ros-diffs] [gvg] 20129: Sync to Wine-0_9_3: