Merge pull request #2873 from darwinel/develop

Some other small writing consistency fixes