[ros-diffs] [hbelusca] 59285: Synchronize with trunk revision r59284