Update README to reflect latest version.
Merge branch 'master' into develop.