Merge pull request #3276 from chrismcn/upstream_turbostat