Merge "Fix various mistakes in PHPDoc comments"