Correct phpdoc comments.
Merge branch 'phpdoc' into develop