Update README.md
Merge branch '2.x' into dev