Update README.md

Squashed version of #3056

r=jack