Merge branch 'pm-sleep'