Merge HEAD from ../scsi-iscsi-2.6