Merge pull request #3550 from natepizzle/develop

[ci skip] Docblock wording fix