Don't return binary Strings in Timezone#friendly_identifier.

(cherry picked from commit d213131)

lib/tzinfo/timezone.rb

@@ -236,13 +236,9 @@ def friendly_identifier(skip_first_part = false)
       elsif parts.length == 1        
         parts[0]
       else
-        if skip_first_part
-          result = String.new
-        else
-          result = parts[0] + ' - '
-        end
-
-        parts[1, parts.length - 1].reverse_each {|part|
+        prefix = skip_first_part ? nil : "#{parts[0]} - "
+
+        parts = parts.drop(1).map do |part|
           part.gsub!(/_/, ' ')
 
           if part.index(/[a-z]/)
@@ -254,13 +250,11 @@ def friendly_identifier(skip_first_part = false)
             # Missing an apostrophe if two consecutive upper case characters.
             part.gsub!(/([A-Z])([A-Z])/, '\1\'\2')
           end
-
-          result << part
-          result << ', '
-        }
-
-        result.slice!(result.length - 2, 2)
-        result
+
+          part
+        end
+
+        "#{prefix}#{parts.reverse.join(', ')}"
       end
     end
 

test/tc_timezone.rb

@@ -436,6 +436,11 @@ def test_friendly_identifier
     assert_equal('UTC', TestTimezone.new('UTC').friendly_identifier)
   end
 
+  def test_friendly_identifier_non_binary_encoding
+    refute_equal(Encoding::ASCII_8BIT, TestTimezone.new('Europe/Paris').friendly_identifier(true).encoding)
+    refute_equal(Encoding::ASCII_8BIT, TestTimezone.new('Europe/Paris').friendly_identifier(false).encoding)
+  end
+
   def test_to_s
     assert_equal('Europe - Paris', TestTimezone.new('Europe/Paris').to_s)
     assert_equal('America - Knox, Indiana', TestTimezone.new('America/Indiana/Knox').to_s)