Fixed {@inheritdoc}
Missing bare docblocks
Merge remote-tracking branch 'origin/master'