[ros-diffs] [cgutman] 37341: - Merge r37399 from trunk