[ros-diffs] [tkreuzer] 41032: Sync trunk head (r41026)