[ros-diffs] [hyperion] 37060: Daily merge from trunk (36960-37059). You guys sure commit a lot