Merge branch 'scsi-scan'