[ros-diffs] [gedmurphy] 30437: I thought these changes were in the last commit..