Update README.md
Merge remote-tracking branch 'origin/master' into hotfix_2.5