Port bwa 0.7 (on correct branch this time)