Merge pull request #6802 from nupplaphil/task/readmes