[ros-diffs] [tkreuzer] 47271: sync with trunk (r47268)