Make joinx less aggressive when merging so it doesn't merge overlapping variants
Merge branch 'fireteam' into gb_master