r436: fix rare MD/NM-CIGAR inconsistencies
Merge branch 'master' into mem