[ros-diffs] [spetreolle] 46172: Merge r45172 from trunk.