Merge pull request #1595 from rubenk/turbostat-fix-shadowing-issue