Merge branch 'develop' into bcftools+calling
Merge branch 'bcftools+calling' into develop