Merge "Normalize PHPDoc attributes"