[ros-diffs] [hbelusca] 61579: Sync up with trunk r61578.