Fix another merge typo
Merge branch 'branches/rudder/2.6'