Merge branches 'pm-sleep' and 'powercap'