[ros-diffs] [hbelusca] 57637: Synchronize with trunk's revision r57636.