Merge branch 'release/2.4'
Merge branch 'release/2.5'
Update README.md
Merge branch 'master' into develop

* master:
  Update README.md