fix copypaste error
Merge branch '2.x' into 2.5