Docblock fixes
Merge pull request #3578 from GrahamCampbell/docblocks

Docblock Fixes