Merge branch 'bcftools+calling' into develop