[ros-diffs] [gvg] 21764: Repair a failed merge. Fixes bug 1442.