Merge branch 'master' into pm-sleep