Merge branch 'lorenzo/pci/altera'