[ros-diffs] [tkreuzer] 49240: sync with trunk (r49238)