Merge remote-tracking branch 'ext_pwd/master'

Merge external powertop