[ros-diffs] [hbelusca] 59784: Synchronize with trunk revision 59781.