[ros-diffs] [gvg] 14053: Re-import because of SVN problems