Merge pull request #6736 from remitamine/readme