[ros-diffs] [gvg] 19977: Merge from trunk: