Merge pull request #12576 from gsfreema/readme-fixes