[ros-diffs] [akhaldi] 64380: * Sync up to trunk head (r64377).