Docblock fixes
Merge pull request #3082 from ADmad/3.0-docblocks

Docblock fixes