Merge KnockOverTree -> master