[ros-diffs] [janderwald] 49927: - Update to trunk