Fixed docblocks
Merge pull request #3964 from GrahamCampbell/4.1-docblocks

Fixed Docblocks