Updated README.md
Updated README.md
Merge branch '2.5'
Various adjustments
Merge branch '2.5'