[ros-diffs] [jcatena] 45592: [branch] merge trunk head