[ros-diffs] [tkreuzer] 45467: Merge trunk head (r45466)