Merge branches 'pm-pci' and 'pm-docs'