fixed wrong merge
Merge branch '2.5' into 2.6

* 2.5:
  fixed wrong merge