Merge branch 'scsi2sd-util'