[ros-diffs] [jjones] 59263: Merge with trunk