Merge branches 'pm-core', 'powercap' and 'pm-tools'