query: experimental speedup for VCFs with -s
Minor documentation formatting
Minor usage help text change
merge: Use new bcf_hdr_combine()
stats: New -u option
Merge branch 'master' of github.com:samtools/bcftools