merge samtools/samtools:develop into wtsi-hgi/samtools:develop