[ros-diffs] [dquintana] 75821: * Sync with trunk HEAD (r75820).