Fixed some docblocks
Added missing types
Merge pull request #6697 from GrahamForks/4.2-doc

[4.2] Fixed Some Docblocks