Merge "Fix a few minor mistakes in PHPDoc tags"