Merge "Do not omit enum_field_value in JSON dumps"