Updates README
Merge branch 'master' into 2-3-stable