Cleaned up the docblocks, removed anything that had no value Fixes rSPT7f6053a73c80d5554d5fb59c45da5f9b8e06c543
Merge remote-tracking branch 'origin/master'