Compatibility with psutil 2.x
Merge remote-tracking branch 'origin/master'
Compatibility with psutil 2.x