Fixed 2 docblocks
Merge remote-tracking branch 'origin/0.6'