[ros-diffs] [hbelusca] 63129: Sync with trunk revision 63128.