Correct bad merge (sorry)
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7