Update README.md
Merge branch '2.0-maint' into 2.1-maint
update readme
Merge branch '2.1-maint'
update readme