Fix problems with the merge.
Merge remote-tracking branch 'origin/outgroupDepth' into outgroupDepth