Merge pull request #873 from TheBlueMatt/2021-861-missing-eof-eol