phpdoc fixes
Merge pull request #5574