[ros-diffs] [cgutman] 37594: - Merge r37593 which I accidentally committed to trunk