fix overtyping of 0
Merge branch '2.x' into 2.6