[ros-diffs] [tkreuzer] 48799: sync with trunk head (r48792)