removed errors from git
Merge branch '2.5'

* 2.5:
  removed errors from git