[ros-diffs] [tkreuzer] 43759: Merge trunk head (r43756)