Merge commit 'pm-fixes-for-3.3-rc3' into pm-sleep