merging samtools/htslib:develop into wtsi-hgi