[ros-diffs] [hbelusca] 63106: Synced with trunk revision 63103.