[ros-diffs] [tkreuzer] 46585: Merge trunk head (r46584)