Merge branch 'pm-freezer' into pm-for-linus