Merge branches 'misc' and 'powercap'