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