Merge branches 'pm-sleep' and 'pm-tools'