Merge branch 'master' into linux, including updating READMEs.