[ros-diffs] [tkreuzer] 44588: copy from trunk