Merge branches 'pm-tools' and 'powercap'