[ros-diffs] [tkreuzer] 41488: Merge trunk head (r41474)