Integrate fix for bug from PyVCF primary tree into our tree...