Merge from samtools:master