[ros-diffs] [hbelusca] 64100: Sync with trunk revision 64099.