Merge remote branch 'mainstream/master'

Conflicts:
	railties/lib/rails/railtie.rb

171 files changed, 188 insertions, 18567 deletions

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 87ec6f2a2c..787fa26e44 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,4 +1,12 @@
-*Edge*
+*Rails 3.0 (pending)*
+
+* Time#- with a DateTime argument behaves the same as with a Time argument, i.e. returns the difference between self and arg as a Float #3476 [Geoff Buesing]
+
+* YAML serialization for OrderedHash.  #3608 [Gregor Schmidt]
+
+* Update bundled TZInfo to v0.3.16 [Geoff Buesing]
+
+* Georgetown TimeZone is now mapped to "America/Guyana" instead of "America/Argentina/San_Juan" #1821 [Geoff Buesing, Reuben Sivan]
 
 * Changed the default ActiveSupport.use_standard_json_time_format from false to true and
 ActiveSupport.escape_html_entities_in_json from true to false to match previously announced Rails 3 defaults [DHH]
diff --git a/activesupport/Rakefile b/activesupport/Rakefile
index 08af1d6fca..03ab3b2760 100644
--- a/activesupport/Rakefile
+++ b/activesupport/Rakefile
@@ -41,7 +41,6 @@ Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/active_support.rb')
   rdoc.rdoc_files.include('lib/active_support/**/*.rb')
-  rdoc.rdoc_files.exclude('lib/active_support/vendor/*')
 }
 
 spec = eval(File.read('activesupport.gemspec'))
@@ -74,102 +73,3 @@ task :release => [ :package ] do
   rubyforge.login
   rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
 end
-
-
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/lib"
-require 'active_support/values/time_zone'
-
-namespace :tzinfo do
-  desc "Update bundled tzinfo gem. Only copies the subset of classes and definitions required to support Rails time zone features."
-  task :update => ['tzinfo:copy_classes', 'tzinfo:copy_definitions'] do
-    Rake::Task['tzinfo:cleanup_tmp'].invoke
-    puts <<-EOV
-    *** FINAL TZINFO BUNDLING STEPS ***
-
-    1. Update TZInfo version in lib/active_support/vendor.rb
-    2. gem uninstall tzinfo on local system before running tests, to ensure tests are running against bundled version
-
-    If a test fails because a particular zone can't be found, it's likely because the TZInfo identifier in the
-    ActiveSupport::TimeZone::MAPPING hash is referencing a linked timezone instead of referencing the timezone directly.
-    In this case, just change the MAPPING value to the correct identifier, and unpack TZInfo again.
-    EOV
-  end
-
-  task :unpack_gem do
-    mkdir_p "tmp"
-    cd "tmp"
-    sh "gem unpack --version #{ENV['VERSION'] || "'> 0'"} tzinfo"
-    cd ".."
-  end
-
-  task :copy_classes => :unpack_gem do
-    mkdir_p "#{destination_path}/lib/tzinfo"
-    cp "#{tmp_path}/lib/tzinfo.rb", "#{destination_path}/lib"
-    comment_requires_for_excluded_classes!('lib/tzinfo.rb')
-    files = FileList["#{tmp_path}/lib/tzinfo/*.rb"]
-    files.each do |file|
-      filename = File.basename(file)
-      unless excluded_classes.include? filename.sub(/.rb$/, '')
-        cp "#{tmp_path}/lib/tzinfo/#{filename}", "#{destination_path}/lib/tzinfo"
-        comment_requires_for_excluded_classes!("lib/tzinfo/#{filename}")
-      end
-    end
-  end
-
-  task :copy_definitions => :unpack_gem do
-    definitions_path = "#{destination_path}/lib/tzinfo/definitions/"
-    mkdir_p definitions_path
-    ActiveSupport::TimeZone::MAPPING.values.each do |zone|
-      subdir = nil
-      if /\// === zone
-        subdir = zone.sub(/\w+$/, '')
-        mkdir_p "#{definitions_path}/#{subdir}"
-      end
-      cp "#{tmp_path}/lib/tzinfo/definitions/#{zone}.rb", "#{definitions_path}/#{subdir}"
-    end
-  end
-
-  task :cleanup_tmp do
-    rm_rf "tmp"
-  end
-
-  def comment_requires_for_excluded_classes!(file)
-    lines = open("#{destination_path}/#{file}") {|f| f.readlines}
-    updated = false
-
-    new_lines = []
-    lines.each do |line|
-      if Regexp.new("require 'tzinfo/(#{excluded_classes.join('|')})'") === line
-        updated = true
-        new_lines << "# #{line}"
-      else
-        new_lines << line
-      end
-    end
-
-    if updated
-      open("#{destination_path}/#{file}", "w") {|f| f.write(new_lines.join)}
-    end
-  end
-
-  def version
-    ENV['VERSION'] ||= get_unpacked_version
-  end
-
-  def get_unpacked_version
-    m = (FileList["tmp/tzinfo-*"].to_s.match /\d+\.\d+\.\d+/)
-    m ? m[0] : raise(LoadError, "TZInfo gem must be installed locally. `gem install tzinfo` and try again")
-  end
-
-  def tmp_path
-    "tmp/tzinfo-#{version}"
-  end
-
-  def destination_path
-    "lib/active_support/vendor/tzinfo-#{version}"
-  end
-
-  def excluded_classes
-    %w(country country_index_definition country_info country_timezone timezone_index_definition timezone_proxy tzdataparser)
-  end
-end
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index 8b9dd55b53..19cdbaa41a 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -7,6 +7,9 @@ Gem::Specification.new do |s|
   s.description = %q{Utility library which carries commonly used classes and goodies from the Rails framework}
 
   s.add_dependency('i18n', '~> 0.3.0')
+  s.add_dependency('tzinfo', '~> 0.3.16')
+  s.add_dependency('builder', '~> 2.1.2')
+  s.add_dependency('memcache-client', '~> 1.7.5')
 
   s.files = Dir['CHANGELOG', 'README', 'lib/**/*']
   s.require_path = 'lib'
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 51ec87f329..833ae351b9 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -69,5 +69,3 @@ module ActiveSupport
 
   autoload :TestCase
 end
-
-require 'active_support/vendor'
diff --git a/activesupport/lib/active_support/core_ext/array.rb b/activesupport/lib/active_support/core_ext/array.rb
index b583c7533e..4688468a8f 100644
--- a/activesupport/lib/active_support/core_ext/array.rb
+++ b/activesupport/lib/active_support/core_ext/array.rb
@@ -1,5 +1,6 @@
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/array/access'
+require 'active_support/core_ext/array/uniq_by'
 require 'active_support/core_ext/array/conversions'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/array/grouping'
diff --git a/activesupport/lib/active_support/core_ext/array/conversions.rb b/activesupport/lib/active_support/core_ext/array/conversions.rb
index 7fcef38372..814567a5a6 100644
--- a/activesupport/lib/active_support/core_ext/array/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/array/conversions.rb
@@ -13,19 +13,6 @@ class Array
     default_two_words_connector = I18n.translate(:'support.array.two_words_connector', :locale => options[:locale])
     default_last_word_connector = I18n.translate(:'support.array.last_word_connector', :locale => options[:locale])
 
-    # Try to emulate to_sentences previous to 2.3
-    if options.has_key?(:connector) || options.has_key?(:skip_last_comma)
-      ::ActiveSupport::Deprecation.warn(":connector has been deprecated. Use :words_connector instead", caller) if options.has_key? :connector
-      ::ActiveSupport::Deprecation.warn(":skip_last_comma has been deprecated. Use :last_word_connector instead", caller) if options.has_key? :skip_last_comma
-
-      skip_last_comma = options.delete :skip_last_comma
-      if connector = options.delete(:connector)
-        options[:last_word_connector] ||= skip_last_comma ? connector : ", #{connector}"
-      else
-        options[:last_word_connector] ||= skip_last_comma ? default_two_words_connector : default_last_word_connector
-      end
-    end
-
     options.assert_valid_keys(:words_connector, :two_words_connector, :last_word_connector, :locale)
     options.reverse_merge! :words_connector => default_words_connector, :two_words_connector => default_two_words_connector, :last_word_connector => default_last_word_connector
 
diff --git a/activesupport/lib/active_support/core_ext/array/uniq_by.rb b/activesupport/lib/active_support/core_ext/array/uniq_by.rb
new file mode 100644
index 0000000000..a09b2302fd
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/array/uniq_by.rb
@@ -0,0 +1,17 @@
+class Array
+  # Return an unique array based on the criteria given as a proc.
+  #
+  #   [1, 2, 3, 4].uniq_by { |i| i.odd? }
+  #   #=> [1, 2]
+  #
+  def uniq_by
+    hash, array = {}, []
+    each { |i| hash[yield(i)] ||= (array << i) }
+    array
+  end
+
+  # Same as uniq_by, but modifies self.
+  def uniq_by!
+    replace(uniq_by{ |i| yield(i) })
+  end
+end
diff --git a/activesupport/lib/active_support/core_ext/class.rb b/activesupport/lib/active_support/core_ext/class.rb
index 44ad6c8c08..62df7d8b82 100644
--- a/activesupport/lib/active_support/core_ext/class.rb
+++ b/activesupport/lib/active_support/core_ext/class.rb
@@ -1,4 +1,3 @@
 require 'active_support/core_ext/class/attribute_accessors'
 require 'active_support/core_ext/class/inheritable_attributes'
-require 'active_support/core_ext/class/removal'
 require 'active_support/core_ext/class/delegating_attributes'
diff --git a/activesupport/lib/active_support/core_ext/class/removal.rb b/activesupport/lib/active_support/core_ext/class/removal.rb
deleted file mode 100644
index 652be4ed78..0000000000
--- a/activesupport/lib/active_support/core_ext/class/removal.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-require 'active_support/core_ext/object/extending'
-require 'active_support/core_ext/module/introspection'
-
-class Class #:nodoc:
-
-  def reachable?
-    eval("defined?(::#{self}) && ::#{self}.equal?(self)")
-  end
-
-  # Unassociates the class with its subclasses and removes the subclasses
-  # themselves.
-  #
-  #   Integer.remove_subclasses # => [Bignum, Fixnum]
-  #   Fixnum                    # => NameError: uninitialized constant Fixnum
-  def remove_subclasses
-    Object.remove_subclasses_of(self)
-  end
-
-  # Returns an array with the names of the subclasses of +self+ as strings.
-  #
-  #   Integer.subclasses # => ["Bignum", "Fixnum"]
-  def subclasses
-    Object.subclasses_of(self).map { |o| o.to_s }
-  end
-
-  # Removes the classes in +klasses+ from their parent module.
-  #
-  # Ordinary classes belong to some module via a constant. This method computes
-  # that constant name from the class name and removes it from the module it
-  # belongs to.
-  #
-  #   Object.remove_class(Integer) # => [Integer]
-  #   Integer                      # => NameError: uninitialized constant Integer
-  #
-  # Take into account that in general the class object could be still stored
-  # somewhere else.
-  #
-  #   i = Integer                  # => Integer
-  #   Object.remove_class(Integer) # => [Integer]
-  #   Integer                      # => NameError: uninitialized constant Integer
-  #   i.subclasses                 # => ["Bignum", "Fixnum"]
-  #   Fixnum.superclass            # => Integer
-  def remove_class(*klasses)
-    klasses.flatten.each do |klass|
-      # Skip this class if there is nothing bound to this name
-      next unless defined?(klass.name)
-      
-      basename = klass.to_s.split("::").last
-      parent = klass.parent
-      
-      # Skip this class if it does not match the current one bound to this name
-      next unless parent.const_defined?(basename) && klass = parent.const_get(basename)
-
-      parent.instance_eval { remove_const basename } unless parent == klass
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/core_ext/hash/deep_merge.rb b/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
index 24d0a2a481..af771c86ff 100644
--- a/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
+++ b/activesupport/lib/active_support/core_ext/hash/deep_merge.rb
@@ -1,17 +1,16 @@
 class Hash
   # Returns a new hash with +self+ and +other_hash+ merged recursively.
   def deep_merge(other_hash)
-    target = dup
-    other_hash.each_pair do |k,v|
-      tv = target[k]
-      target[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
-    end
-    target
+    dup.deep_merge!(other_hash)
   end
 
   # Returns a new hash with +self+ and +other_hash+ merged recursively.
   # Modifies the receiver in place.
   def deep_merge!(other_hash)
-    replace(deep_merge(other_hash))
+    other_hash.each_pair do |k,v|
+      tv = self[k]
+      self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge(v) : v
+    end
+    self
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/hash/keys.rb b/activesupport/lib/active_support/core_ext/hash/keys.rb
index ecd63293b4..045a6944fa 100644
--- a/activesupport/lib/active_support/core_ext/hash/keys.rb
+++ b/activesupport/lib/active_support/core_ext/hash/keys.rb
@@ -1,10 +1,7 @@
 class Hash
   # Return a new hash with all keys converted to strings.
   def stringify_keys
-    inject({}) do |options, (key, value)|
-      options[key.to_s] = value
-      options
-    end
+    dup.stringify_keys!
   end
 
   # Destructively convert all keys to strings.
@@ -18,16 +15,16 @@ class Hash
   # Return a new hash with all keys converted to symbols, as long as
   # they respond to +to_sym+.
   def symbolize_keys
-    inject({}) do |options, (key, value)|
-      options[(key.to_sym rescue key) || key] = value
-      options
-    end
+    dup.symbolize_keys!
   end
 
   # Destructively convert all keys to symbols, as long as they respond
   # to +to_sym+.
   def symbolize_keys!
-    self.replace(self.symbolize_keys)
+    keys.each do |key|
+      self[(key.to_sym rescue key) || key] = delete(key)
+    end
+    self
   end
 
   alias_method :to_options,  :symbolize_keys
diff --git a/activesupport/lib/active_support/core_ext/object.rb b/activesupport/lib/active_support/core_ext/object.rb
index 04e8f06b3d..08e07a5b24 100644
--- a/activesupport/lib/active_support/core_ext/object.rb
+++ b/activesupport/lib/active_support/core_ext/object.rb
@@ -4,7 +4,6 @@ require 'active_support/core_ext/object/duplicable'
 require 'active_support/core_ext/object/try'
 
 require 'active_support/core_ext/object/conversions'
-require 'active_support/core_ext/object/extending'
 require 'active_support/core_ext/object/instance_variables'
 require 'active_support/core_ext/object/metaclass'
 require 'active_support/core_ext/object/misc'
diff --git a/activesupport/lib/active_support/core_ext/object/extending.rb b/activesupport/lib/active_support/core_ext/object/extending.rb
deleted file mode 100644
index b8b6970382..0000000000
--- a/activesupport/lib/active_support/core_ext/object/extending.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require 'active_support/core_ext/class/removal'
-require 'active_support/core_ext/object/blank'
-
-class Class
-  # Rubinius
-  if defined?(Class.__subclasses__)
-    def descendents
-      subclasses = []
-      __subclasses__.each {|k| subclasses << k; subclasses.concat k.descendents }
-      subclasses
-    end
-  else
-    # MRI
-    begin
-      ObjectSpace.each_object(Class.new) {}
-
-      def descendents
-        subclasses = []
-        ObjectSpace.each_object(class << self; self; end) do |k|
-          subclasses << k unless k == self
-        end
-        subclasses
-      end
-    # JRuby
-    rescue StandardError
-      def descendents
-        subclasses = []
-        ObjectSpace.each_object(Class) do |k|
-          subclasses << k if k < self
-        end
-        subclasses.uniq!
-        subclasses
-      end
-    end
-  end
-end
-
-class Object
-  def remove_subclasses_of(*superclasses) #:nodoc:
-    Class.remove_class(*subclasses_of(*superclasses))
-  end
-
-  # Exclude this class unless it's a subclass of our supers and is defined.
-  # We check defined? in case we find a removed class that has yet to be
-  # garbage collected. This also fails for anonymous classes -- please
-  # submit a patch if you have a workaround.
-  def subclasses_of(*superclasses) #:nodoc:
-    subclasses = []
-    superclasses.each do |klass|
-      subclasses.concat klass.descendents.select {|k| k.name.blank? || k.reachable?}
-    end
-    subclasses
-  end
-
-  def extended_by #:nodoc:
-    ancestors = class << self; ancestors end
-    ancestors.select { |mod| mod.class == Module } - [ Object, Kernel ]
-  end
-
-  def extend_with_included_modules_from(object) #:nodoc:
-    object.extended_by.each { |mod| extend mod }
-  end
-end
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 703b89ffd0..98906bc5c0 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -259,7 +259,7 @@ class Time
   # are coerced into values that Time#- will recognize
   def minus_with_coercion(other)
     other = other.comparable_time if other.respond_to?(:comparable_time)
-    minus_without_coercion(other)
+    other.is_a?(DateTime) ? to_f - other.to_f : minus_without_coercion(other)
   end
   alias_method :minus_without_coercion, :-
   alias_method :-, :minus_with_coercion
diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb
index b492648610..57ead35827 100644
--- a/activesupport/lib/active_support/ordered_hash.rb
+++ b/activesupport/lib/active_support/ordered_hash.rb
@@ -1,8 +1,11 @@
+require 'yaml'
+
 # OrderedHash is namespaced to prevent conflicts with other implementations
 module ActiveSupport
   # Hash is ordered in Ruby 1.9!
   if RUBY_VERSION >= '1.9'
-    OrderedHash = ::Hash
+    class OrderedHash < ::Hash #:nodoc:
+    end
   else
     class OrderedHash < Hash #:nodoc:
       def initialize(*args, &block)
@@ -138,4 +141,24 @@ module ActiveSupport
       end
     end
   end
+
+  class OrderedHash #:nodoc:
+    def to_yaml_type
+      "!tag:yaml.org,2002:omap"
+    end
+
+    def to_yaml(opts = {})
+      YAML.quick_emit(self, opts) do |out|
+        out.seq(taguri, to_yaml_style) do |seq|
+          each do |k, v|
+            seq.add(k => v)
+          end
+        end
+      end
+    end
+  end
+
+  YAML.add_builtin_type("omap") do |type, val|
+    ActiveSupport::OrderedHash[val.map(&:to_a).map(&:first)]
+  end
 end
diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb
new file mode 100644
index 0000000000..c8d8b85000
--- /dev/null
+++ b/activesupport/lib/active_support/railtie.rb
@@ -0,0 +1,64 @@
+require "active_support"
+require "rails"
+
+module ActiveSupport
+  class Railtie < Rails::Railtie
+    railtie_name :active_support
+
+    # Loads support for "whiny nil" (noisy warnings when methods are invoked
+    # on +nil+ values) if Configuration#whiny_nils is true.
+    initializer "active_support.initialize_whiny_nils" do |app|
+      require 'active_support/whiny_nil' if app.config.whiny_nils
+    end
+
+    # Sets the default value for Time.zone
+    # If assigned value cannot be matched to a TimeZone, an exception will be raised.
+    initializer "active_support.initialize_time_zone" do |app|
+      require 'active_support/core_ext/time/zones'
+      zone_default = Time.__send__(:get_zone, app.config.time_zone)
+
+      unless zone_default
+        raise \
+          'Value assigned to config.time_zone not recognized.' +
+          'Run "rake -D time" for a list of tasks for finding appropriate time zone names.'
+      end
+
+      Time.zone_default = zone_default
+    end
+  end
+end
+
+module I18n
+  class Railtie < Rails::Railtie
+    railtie_name :i18n
+
+    # Initialize I18n load paths to an array
+    config.i18n.engines_load_path = []
+    config.i18n.load_path = []
+
+    initializer "i18n.initialize" do
+      require 'active_support/i18n'
+
+      ActionDispatch::Callbacks.to_prepare do
+        I18n.reload!
+      end
+    end
+
+    # Set the i18n configuration from config.i18n but special-case for
+    # the load_path which should be appended to what's already set instead of overwritten.
+    config.after_initialize do |app|
+      app.config.i18n.each do |setting, value|
+        case setting
+        when :engines_load_path
+          app.config.i18n.load_path.unshift(*value)
+        when :load_path
+          I18n.load_path += value
+        else
+          I18n.send("#{setting}=", value)
+        end
+      end
+
+      I18n.reload!
+    end
+  end
+end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 245d3ce051..4db3dd1705 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -55,7 +55,7 @@ module ActiveSupport
         "Newfoundland"                 => "America/St_Johns",
         "Brasilia"                     => "America/Sao_Paulo",
         "Buenos Aires"                 => "America/Argentina/Buenos_Aires",
-        "Georgetown"                   => "America/Argentina/San_Juan",
+        "Georgetown"                   => "America/Guyana",
         "Greenland"                    => "America/Godthab",
         "Mid-Atlantic"                 => "Atlantic/South_Georgia",
         "Azores"                       => "Atlantic/Azores",
@@ -323,9 +323,9 @@ module ActiveSupport
        [-18_000, "Eastern Time (US & Canada)", "Indiana (East)", "Bogota",
                  "Lima", "Quito" ],
        [-16_200, "Caracas" ],
-       [-14_400, "Atlantic Time (Canada)", "La Paz", "Santiago" ],
+       [-14_400, "Atlantic Time (Canada)", "Georgetown", "La Paz", "Santiago" ],
        [-12_600, "Newfoundland" ],
-       [-10_800, "Brasilia", "Buenos Aires", "Georgetown", "Greenland" ],
+       [-10_800, "Brasilia", "Buenos Aires", "Greenland" ],
        [ -7_200, "Mid-Atlantic" ],
        [ -3_600, "Azores", "Cape Verde Is." ],
        [      0, "Dublin", "Edinburgh", "Lisbon", "London", "Casablanca",
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb
deleted file mode 100644
index 1e46491d83..0000000000
--- a/activesupport/lib/active_support/vendor.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'pathname'
-
-def ActiveSupport.requirable?(file)
-  $LOAD_PATH.any? { |p| Dir.glob("#{p}/#{file}.*").any? }
-end
-
-[%w(builder 2.1.2), %w(memcache-client 1.7.5), %w(tzinfo 0.3.15)].each do |lib, version|
-  # If the lib is not already requirable
-  unless ActiveSupport.requirable? lib
-    # Try to activate a gem ~> satisfying the requested version first.
-    begin
-      gem lib, ">= #{version}"
-      # Use the vendored lib if the gem's missing or we aren't using RubyGems.
-    rescue LoadError, NoMethodError
-      # There could be symlinks
-      $LOAD_PATH.unshift Pathname.new(__FILE__).dirname.join("vendor/#{lib}-#{version}/lib").realpath.to_s
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/blankslate.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/blankslate.rb
deleted file mode 100644
index da6034d9c4..0000000000
--- a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/blankslate.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2004, 2006 by Jim Weirich (jim@weirichhouse.org).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#++
-
-######################################################################
-# BlankSlate provides an abstract base class with no predefined
-# methods (except for <tt>\_\_send__</tt> and <tt>\_\_id__</tt>).
-# BlankSlate is useful as a base class when writing classes that
-# depend upon <tt>method_missing</tt> (e.g. dynamic proxies).
-#
-class BlankSlate
-  class << self
-
-    # Hide the method named +name+ in the BlankSlate class.  Don't
-    # hide +instance_eval+ or any method beginning with "__".
-    def hide(name)
-      if instance_methods.include?(name.to_s) and
-        name !~ /^(__|instance_eval)/
-        @hidden_methods ||= {}
-        @hidden_methods[name.to_sym] = instance_method(name)
-        undef_method name
-      end
-    end
-
-    def find_hidden_method(name)
-      @hidden_methods ||= {}
-      @hidden_methods[name] || superclass.find_hidden_method(name)
-    end
-
-    # Redefine a previously hidden method so that it may be called on a blank
-    # slate object.
-    def reveal(name)
-      bound_method = nil
-      unbound_method = find_hidden_method(name)
-      fail "Don't know how to reveal method '#{name}'" unless unbound_method
-      define_method(name) do |*args|
-        bound_method ||= unbound_method.bind(self)
-        bound_method.call(*args)
-      end
-    end
-  end
-
-  instance_methods.each { |m| hide(m) }
-end
-
-######################################################################
-# Since Ruby is very dynamic, methods added to the ancestors of
-# BlankSlate <em>after BlankSlate is defined</em> will show up in the
-# list of available BlankSlate methods.  We handle this by defining a
-# hook in the Object and Kernel classes that will hide any method
-# defined after BlankSlate has been loaded.
-#
-module Kernel
-  class << self
-    alias_method :blank_slate_method_added, :method_added
-
-    # Detect method additions to Kernel and remove them in the
-    # BlankSlate class.
-    def method_added(name)
-      result = blank_slate_method_added(name)
-      return result if self != Kernel
-      BlankSlate.hide(name)
-      result
-    end
-  end
-end
-
-######################################################################
-# Same as above, except in Object.
-#
-class Object
-  class << self
-    alias_method :blank_slate_method_added, :method_added
-
-    # Detect method additions to Object and remove them in the
-    # BlankSlate class.
-    def method_added(name)
-      result = blank_slate_method_added(name)
-      return result if self != Object
-      BlankSlate.hide(name)
-      result
-    end
-
-    def find_hidden_method(name)
-      nil
-    end
-  end
-end
-
-######################################################################
-# Also, modules included into Object need to be scanned and have their
-# instance methods removed from blank slate.  In theory, modules
-# included into Kernel would have to be removed as well, but a
-# "feature" of Ruby prevents late includes into modules from being
-# exposed in the first place.
-#
-class Module
-  alias blankslate_original_append_features append_features
-  def append_features(mod)
-    result = blankslate_original_append_features(mod)
-    return result if mod != Object
-    instance_methods.each do |name|
-      BlankSlate.hide(name)
-    end
-    result
-  end
-end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder.rb
deleted file mode 100644
index 9719277669..0000000000
--- a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-#--
-# Copyright 2004 by Jim Weirich (jim@weirichhouse.org).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#++
-
-require 'builder/xmlmarkup'
-require 'builder/xmlevents'
diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/blankslate.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/blankslate.rb
deleted file mode 100644
index 2935b6f1d1..0000000000
--- a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/blankslate.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2004, 2006 by Jim Weirich (jim@weirichhouse.org).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#++
-
-require 'blankslate'
-
-######################################################################
-# BlankSlate has been promoted to a top level name and is now
-# available as a standalone gem.  We make the name available in the
-# Builder namespace for compatibility.
-#
-module Builder
-  BlankSlate = ::BlankSlate
-end
diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/css.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/css.rb
deleted file mode 100644
index e086a1b132..0000000000
--- a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/css.rb
+++ /dev/null
@@ -1,250 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2004, 2005 by Jim Weirich  (jim@weirichhouse.org).
-# Copyright       2005 by Scott Barron (scott@elitists.net).
-# All rights reserved.
-#
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#
-# Much of this is taken from Jim's work in xmlbase.rb and xmlmarkup.rb.
-# Documentation has also been copied and pasted and modified to reflect
-# that we're building CSS here instead of XML.  Jim is conducting the
-# orchestra here and I'm just off in the corner playing a flute.
-#++
-
-# Provide a flexible and easy to use Builder for creating Cascading
-# Style Sheets (CSS).
-
-
-require 'builder/blankslate'
-
-module Builder
-
-  # Create a Cascading Style Sheet (CSS) using Ruby.
-  #
-  # Example usage:
-  #
-  #   css = Builder::CSS.new
-  #
-  #   text_color      = '#7F7F7F'
-  #   preferred_fonts = 'Helvetica, Arial, sans_serif'
-  #
-  #   css.comment! 'This is our stylesheet'
-  #   css.body {
-  #     background_color '#FAFAFA'
-  #     font_size        'small'
-  #     font_family      preferred_fonts
-  #     color            text_color
-  #   }
-  #
-  #   css.id!('navbar') {
-  #     width            '500px'
-  #   }
-  #
-  #   css.class!('navitem') {
-  #     color            'red'
-  #   }
-  #
-  #   css.a :hover {
-  #     text_decoration  'underline'
-  #   }
-  #
-  #   css.div(:id => 'menu') {
-  #     background       'green'
-  #   }
-  #
-  #   css.div(:class => 'foo') {
-  #     background       'red'
-  #   }
-  #
-  # This will yield the following stylesheet:
-  #
-  #   /* This is our stylesheet */
-  #   body {
-  #     background_color: #FAFAFA;
-  #     font_size:        small;
-  #     font_family:      Helvetica, Arial, sans_serif;
-  #     color:            #7F7F7F;
-  #   }
-  #
-  #   #navbar {
-  #     width:            500px;
-  #   }
-  #
-  #   .navitem {
-  #     color:            red;
-  #   }
-  #
-  #   a:hover {
-  #     text_decoration:  underline;
-  #   }
-  #
-  #   div#menu {
-  #     background:       green;
-  #   }
-  #
-  #   div.foo {
-  #     background:       red;
-  #   }
-  #
-  class CSS < BlankSlate
-
-    # Create a CSS builder.
-    #
-    # out::     Object receiving the markup.1  +out+ must respond to
-    #           <tt><<</tt>.
-    # indent::  Number of spaces used for indentation (0 implies no
-    #           indentation and no line breaks).
-    #
-    def initialize(indent=2)
-      @indent      = indent
-      @target      = []
-      @parts       = []
-      @library     = {}
-    end
-
-    def +(part)
-      _join_with_op! '+'
-      self
-    end
-
-    def >>(part)
-      _join_with_op! ''
-      self
-    end
-
-    def >(part)
-      _join_with_op! '>'
-      self
-    end
-
-    def |(part)
-      _join_with_op! ','
-      self
-    end
-
-    # Return the target of the builder
-    def target!
-      @target * ''
-    end
-
-    # Create a comment string in the output.
-    def comment!(comment_text)
-      @target << "/* #{comment_text} */\n"
-    end
-
-    def id!(arg, &block)
-      _start_container('#'+arg.to_s, nil, block_given?)
-      _css_block(block) if block
-      _unify_block
-      self
-    end
-
-    def class!(arg, &block)
-      _start_container('.'+arg.to_s, nil, block_given?)
-      _css_block(block) if block
-      _unify_block
-      self
-    end
-
-    def store!(sym, &block)
-      @library[sym] = block.to_proc
-    end
-
-    def group!(*args, &block)
-      args.each do |arg|
-        if arg.is_a?(Symbol)
-          instance_eval(&@library[arg])
-        else
-          instance_eval(&arg)
-        end
-        _text ', ' unless arg == args.last
-      end
-      if block
-        _css_block(block)
-        _unify_block
-      end
-    end
-
-    def method_missing(sym, *args, &block)
-      sym = "#{sym}:#{args.shift}" if args.first.kind_of?(Symbol)
-      if block
-        _start_container(sym, args.first)
-        _css_block(block)
-        _unify_block
-      elsif @in_block
-        _indent
-        _css_line(sym, *args)
-        _newline
-        return self
-      else
-        _start_container(sym, args.first, false)
-        _unify_block
-      end
-      self
-    end
-
-    # "Cargo culted" from Jim who also "cargo culted" it.  See xmlbase.rb.
-    def nil?
-      false
-    end
-
-    private
-    def _unify_block
-      @target << @parts * ''
-      @parts = []
-    end
-
-    def _join_with_op!(op)
-      rhs, lhs = @target.pop, @target.pop
-      @target << "#{lhs} #{op} #{rhs}"
-    end
-
-    def _text(text)
-      @parts << text
-    end
-
-    def _css_block(block)
-      _newline
-      _nested_structures(block)
-      _end_container
-      _end_block
-    end
-
-    def _end_block
-      _newline
-      _newline
-    end
-
-    def _newline
-      _text "\n"
-    end
-
-    def _indent
-      _text ' ' * @indent
-    end
-
-    def _nested_structures(block)
-      @in_block = true
-      self.instance_eval(&block)
-      @in_block = false
-    end
-
-    def _start_container(sym, atts = {}, with_bracket = true)
-      selector = sym.to_s
-      selector << ".#{atts[:class]}" if atts && atts[:class]
-      selector << '#' + "#{atts[:id]}" if atts && atts[:id]
-      @parts << "#{selector}#{with_bracket ? ' {' : ''}"
-    end
-
-    def _end_container
-      @parts << "}"
-    end
-
-    def _css_line(sym, *args)
-      _text("#{sym.to_s.gsub('_','-')}: #{args * ' '};")
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xchar.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xchar.rb
deleted file mode 100644
index 8bdbd05899..0000000000
--- a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xchar.rb
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/usr/bin/env ruby
-
-# The XChar library is provided courtesy of Sam Ruby (See
-# http://intertwingly.net/stories/2005/09/28/xchar.rb)
-
-# --------------------------------------------------------------------
-
-# If the Builder::XChar module is not currently defined, fail on any
-# name clashes in standard library classes.
-
-module Builder
-  def self.check_for_name_collision(klass, method_name, defined_constant=nil)
-    if klass.instance_methods.include?(method_name.to_s)
-      fail RuntimeError,
-	"Name Collision: Method '#{method_name}' is already defined in #{klass}"
-    end
-  end
-end
-
-if ! defined?(Builder::XChar)
-  Builder.check_for_name_collision(String, "to_xs")
-  Builder.check_for_name_collision(Fixnum, "xchr")
-end
-
-######################################################################
-module Builder
-
-  ####################################################################
-  # XML Character converter, from Sam Ruby:
-  # (see http://intertwingly.net/stories/2005/09/28/xchar.rb).
-  #
-  module XChar # :nodoc:
-
-    # See
-    # http://intertwingly.net/stories/2004/04/14/i18n.html#CleaningWindows
-    # for details.
-    CP1252 = {			# :nodoc:
-      128 => 8364,		# euro sign
-      130 => 8218,		# single low-9 quotation mark
-      131 =>  402,		# latin small letter f with hook
-      132 => 8222,		# double low-9 quotation mark
-      133 => 8230,		# horizontal ellipsis
-      134 => 8224,		# dagger
-      135 => 8225,		# double dagger
-      136 =>  710,		# modifier letter circumflex accent
-      137 => 8240,		# per mille sign
-      138 =>  352,		# latin capital letter s with caron
-      139 => 8249,		# single left-pointing angle quotation mark
-      140 =>  338,		# latin capital ligature oe
-      142 =>  381,		# latin capital letter z with caron
-      145 => 8216,		# left single quotation mark
-      146 => 8217,		# right single quotation mark
-      147 => 8220,		# left double quotation mark
-      148 => 8221,		# right double quotation mark
-      149 => 8226,		# bullet
-      150 => 8211,		# en dash
-      151 => 8212,		# em dash
-      152 =>  732,		# small tilde
-      153 => 8482,		# trade mark sign
-      154 =>  353,		# latin small letter s with caron
-      155 => 8250,		# single right-pointing angle quotation mark
-      156 =>  339,		# latin small ligature oe
-      158 =>  382,		# latin small letter z with caron
-      159 =>  376,		# latin capital letter y with diaeresis
-    }
-
-    # See http://www.w3.org/TR/REC-xml/#dt-chardata for details.
-    PREDEFINED = {
-      38 => '&amp;',		# ampersand
-      60 => '&lt;',		# left angle bracket
-      62 => '&gt;',		# right angle bracket
-    }
-
-    # See http://www.w3.org/TR/REC-xml/#charsets for details.
-    VALID = [
-      0x9, 0xA, 0xD,
-      (0x20..0xD7FF),
-      (0xE000..0xFFFD),
-      (0x10000..0x10FFFF)
-    ]
-  end
-
-end
-
-
-######################################################################
-# Enhance the Fixnum class with a XML escaped character conversion.
-#
-class Fixnum
-  XChar = Builder::XChar if ! defined?(XChar)
-
-  # XML escaped version of chr
-  def xchr
-    n = XChar::CP1252[self] || self
-    case n when *XChar::VALID
-      XChar::PREDEFINED[n] or (n<128 ? n.chr : "&##{n};")
-    else
-      '*'
-    end
-  end
-end
-
-
-######################################################################
-# Enhance the String class with a XML escaped character version of
-# to_s.
-#
-class String
-  # XML escaped version of to_s
-  def to_xs
-    unpack('U*').map {|n| n.xchr}.join # ASCII, UTF-8
-  rescue
-    unpack('C*').map {|n| n.xchr}.join # ISO-8859-1, WIN-1252
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlbase.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlbase.rb
deleted file mode 100644
index ace4b56d59..0000000000
--- a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlbase.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'builder/blankslate'
-
-module Builder
-
-  # Generic error for builder
-  class IllegalBlockError < RuntimeError; end
-
-  # XmlBase is a base class for building XML builders.  See
-  # Builder::XmlMarkup and Builder::XmlEvents for examples.
-  class XmlBase < BlankSlate
-
-    # Create an XML markup builder.
-    #
-    # out::     Object receiving the markup.  +out+ must respond to
-    #           <tt><<</tt>.
-    # indent::  Number of spaces used for indentation (0 implies no
-    #           indentation and no line breaks).
-    # initial:: Level of initial indentation.
-    #
-    def initialize(indent=0, initial=0)
-      @indent = indent
-      @level  = initial
-    end
-
-    # Create a tag named +sym+.  Other than the first argument which
-    # is the tag name, the arguments are the same as the tags
-    # implemented via <tt>method_missing</tt>.
-    def tag!(sym, *args, &block)
-      method_missing(sym.to_sym, *args, &block)
-    end
-
-    # Create XML markup based on the name of the method.  This method
-    # is never invoked directly, but is called for each markup method
-    # in the markup block.
-    def method_missing(sym, *args, &block)
-      text = nil
-      attrs = nil
-      sym = "#{sym}:#{args.shift}" if args.first.kind_of?(Symbol)
-      args.each do |arg|
-        case arg
-        when Hash
-          attrs ||= {}
-          attrs.merge!(arg)
-        else
-          text ||= ''
-          text << arg.to_s
-        end
-      end
-      if block
-        unless text.nil?
-          raise ArgumentError, "XmlMarkup cannot mix a text argument with a block"
-        end
-        _indent
-        _start_tag(sym, attrs)
-        _newline
-        _nested_structures(block)
-        _indent
-        _end_tag(sym)
-        _newline
-      elsif text.nil?
-        _indent
-        _start_tag(sym, attrs, true)
-        _newline
-      else
-        _indent
-        _start_tag(sym, attrs)
-        text! text
-        _end_tag(sym)
-        _newline
-      end
-      @target
-    end
-
-    # Append text to the output target.  Escape any markup.  May be
-    # used within the markup brackets as:
-    #
-    #   builder.p { |b| b.br; b.text! "HI" }   #=>  <p><br/>HI</p>
-    def text!(text)
-      _text(_escape(text))
-    end
-
-    # Append text to the output target without escaping any markup.
-    # May be used within the markup brackets as:
-    #
-    #   builder.p { |x| x << "<br/>HI" }   #=>  <p><br/>HI</p>
-    #
-    # This is useful when using non-builder enabled software that
-    # generates strings.  Just insert the string directly into the
-    # builder without changing the inserted markup.
-    #
-    # It is also useful for stacking builder objects.  Builders only
-    # use <tt><<</tt> to append to the target, so by supporting this
-    # method/operation builders can use other builders as their
-    # targets.
-    def <<(text)
-      _text(text)
-    end
-
-    # For some reason, nil? is sent to the XmlMarkup object.  If nil?
-    # is not defined and method_missing is invoked, some strange kind
-    # of recursion happens.  Since nil? won't ever be an XML tag, it
-    # is pretty safe to define it here. (Note: this is an example of
-    # cargo cult programming,
-    # cf. http://fishbowl.pastiche.org/2004/10/13/cargo_cult_programming).
-    def nil?
-      false
-    end
-
-    private
-
-    require 'builder/xchar'
-    def _escape(text)
-      text.to_xs
-    end
-
-    def _escape_quote(text)
-      _escape(text).gsub(%r{"}, '&quot;')  # " WART
-    end
-
-    def _newline
-      return if @indent == 0
-      text! "\n"
-    end
-
-    def _indent
-      return if @indent == 0 || @level == 0
-      text!(" " * (@level * @indent))
-    end
-
-    def _nested_structures(block)
-      @level += 1
-      block.call(self)
-    ensure
-      @level -= 1
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlevents.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlevents.rb
deleted file mode 100644
index b373e4da3c..0000000000
--- a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlevents.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env ruby
-
-#--
-# Copyright 2004 by Jim Weirich (jim@weirichhouse.org).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#++
-
-require 'builder/xmlmarkup'
-
-module Builder
-
-  # Create a series of SAX-like XML events (e.g. start_tag, end_tag)
-  # from the markup code.  XmlEvent objects are used in a way similar
-  # to XmlMarkup objects, except that a series of events are generated
-  # and passed to a handler rather than generating character-based
-  # markup.
-  #
-  # Usage:
-  #   xe = Builder::XmlEvents.new(handler)
-  #   xe.title("HI")    # Sends start_tag/end_tag/text messages to the handler.
-  #
-  # Indentation may also be selected by providing value for the
-  # indentation size and initial indentation level.
-  #
-  #   xe = Builder::XmlEvents.new(handler, indent_size, initial_indent_level)
-  #
-  # == XML Event Handler
-  #
-  # The handler object must expect the following events.
-  #
-  # [<tt>start_tag(tag, attrs)</tt>]
-  #     Announces that a new tag has been found.  +tag+ is the name of
-  #     the tag and +attrs+ is a hash of attributes for the tag.
-  #
-  # [<tt>end_tag(tag)</tt>]
-  #     Announces that an end tag for +tag+ has been found.
-  #
-  # [<tt>text(text)</tt>]
-  #     Announces that a string of characters (+text+) has been found.
-  #     A series of characters may be broken up into more than one
-  #     +text+ call, so the client cannot assume that a single
-  #     callback contains all the text data.
-  #
-  class XmlEvents < XmlMarkup
-    def text!(text)
-      @target.text(text)
-    end
-
-    def _start_tag(sym, attrs, end_too=false)
-      @target.start_tag(sym, attrs)
-      _end_tag(sym) if end_too
-    end
-
-    def _end_tag(sym)
-      @target.end_tag(sym)
-    end
-  end
-
-end
diff --git a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlmarkup.rb b/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlmarkup.rb
deleted file mode 100644
index ec59dddc36..0000000000
--- a/activesupport/lib/active_support/vendor/builder-2.1.2/lib/builder/xmlmarkup.rb
+++ /dev/null
@@ -1,328 +0,0 @@
-#!/usr/bin/env ruby
-#--
-# Copyright 2004, 2005 by Jim Weirich (jim@weirichhouse.org).
-# All rights reserved.
-
-# Permission is granted for use, copying, modification, distribution,
-# and distribution of modified versions of this work as long as the
-# above copyright notice is included.
-#++
-
-# Provide a flexible and easy to use Builder for creating XML markup.
-# See XmlBuilder for usage details.
-
-require 'builder/xmlbase'
-
-module Builder
-
-  # Create XML markup easily.  All (well, almost all) methods sent to
-  # an XmlMarkup object will be translated to the equivalent XML
-  # markup.  Any method with a block will be treated as an XML markup
-  # tag with nested markup in the block.
-  #
-  # Examples will demonstrate this easier than words.  In the
-  # following, +xm+ is an +XmlMarkup+ object.
-  #
-  #   xm.em("emphasized")             # => <em>emphasized</em>
-  #   xm.em { xmm.b("emp & bold") }   # => <em><b>emph &amp; bold</b></em>
-  #   xm.a("A Link", "href"=>"http://onestepback.org")
-  #                                   # => <a href="http://onestepback.org">A Link</a>
-  #   xm.div { br }                    # => <div><br/></div>
-  #   xm.target("name"=>"compile", "option"=>"fast")
-  #                                   # => <target option="fast" name="compile"\>
-  #                                   # NOTE: order of attributes is not specified.
-  #
-  #   xm.instruct!                   # <?xml version="1.0" encoding="UTF-8"?>
-  #   xm.html {                      # <html>
-  #     xm.head {                    #   <head>
-  #       xm.title("History")        #     <title>History</title>
-  #     }                            #   </head>
-  #     xm.body {                    #   <body>
-  #       xm.comment! "HI"           #     <! -- HI -->
-  #       xm.h1("Header")            #     <h1>Header</h1>
-  #       xm.p("paragraph")          #     <p>paragraph</p>
-  #     }                            #   </body>
-  #   }                              # </html>
-  #
-  # == Notes:
-  #
-  # * The order that attributes are inserted in markup tags is
-  #   undefined.
-  #
-  # * Sometimes you wish to insert text without enclosing tags.  Use
-  #   the <tt>text!</tt> method to accomplish this.
-  #
-  #   Example:
-  #
-  #     xm.div {                          # <div>
-  #       xm.text! "line"; xm.br          #   line<br/>
-  #       xm.text! "another line"; xmbr   #    another line<br/>
-  #     }                                 # </div>
-  #
-  # * The special XML characters <, >, and & are converted to &lt;,
-  #   &gt; and &amp; automatically.  Use the <tt><<</tt> operation to
-  #   insert text without modification.
-  #
-  # * Sometimes tags use special characters not allowed in ruby
-  #   identifiers.  Use the <tt>tag!</tt> method to handle these
-  #   cases.
-  #
-  #   Example:
-  #
-  #     xml.tag!("SOAP:Envelope") { ... }
-  #
-  #   will produce ...
-  #
-  #     <SOAP:Envelope> ... </SOAP:Envelope>"
-  #
-  #   <tt>tag!</tt> will also take text and attribute arguments (after
-  #   the tag name) like normal markup methods.  (But see the next
-  #   bullet item for a better way to handle XML namespaces).
-  #
-  # * Direct support for XML namespaces is now available.  If the
-  #   first argument to a tag call is a symbol, it will be joined to
-  #   the tag to produce a namespace:tag combination.  It is easier to
-  #   show this than describe it.
-  #
-  #     xml.SOAP :Envelope do ... end
-  #
-  #   Just put a space before the colon in a namespace to produce the
-  #   right form for builder (e.g. "<tt>SOAP:Envelope</tt>" =>
-  #   "<tt>xml.SOAP :Envelope</tt>")
-  #
-  # * XmlMarkup builds the markup in any object (called a _target_)
-  #   that accepts the <tt><<</tt> method.  If no target is given,
-  #   then XmlMarkup defaults to a string target.
-  #
-  #   Examples:
-  #
-  #     xm = Builder::XmlMarkup.new
-  #     result = xm.title("yada")
-  #     # result is a string containing the markup.
-  #
-  #     buffer = ""
-  #     xm = Builder::XmlMarkup.new(buffer)
-  #     # The markup is appended to buffer (using <<)
-  #
-  #     xm = Builder::XmlMarkup.new(STDOUT)
-  #     # The markup is written to STDOUT (using <<)
-  #
-  #     xm = Builder::XmlMarkup.new
-  #     x2 = Builder::XmlMarkup.new(:target=>xm)
-  #     # Markup written to +x2+ will be send to +xm+.
-  #
-  # * Indentation is enabled by providing the number of spaces to
-  #   indent for each level as a second argument to XmlBuilder.new.
-  #   Initial indentation may be specified using a third parameter.
-  #
-  #   Example:
-  #
-  #     xm = Builder.new(:indent=>2)
-  #     # xm will produce nicely formatted and indented XML.
-  #
-  #     xm = Builder.new(:indent=>2, :margin=>4)
-  #     # xm will produce nicely formatted and indented XML with 2
-  #     # spaces per indent and an over all indentation level of 4.
-  #
-  #     builder = Builder::XmlMarkup.new(:target=>$stdout, :indent=>2)
-  #     builder.name { |b| b.first("Jim"); b.last("Weirich) }
-  #     # prints:
-  #     #     <name>
-  #     #       <first>Jim</first>
-  #     #       <last>Weirich</last>
-  #     #     </name>
-  #
-  # * The instance_eval implementation which forces self to refer to
-  #   the message receiver as self is now obsolete.  We now use normal
-  #   block calls to execute the markup block.  This means that all
-  #   markup methods must now be explicitly send to the xml builder.
-  #   For instance, instead of
-  #
-  #      xml.div { strong("text") }
-  #
-  #   you need to write:
-  #
-  #      xml.div { xml.strong("text") }
-  #
-  #   Although more verbose, the subtle change in semantics within the
-  #   block was found to be prone to error.  To make this change a
-  #   little less cumbersome, the markup block now gets the markup
-  #   object sent as an argument, allowing you to use a shorter alias
-  #   within the block.
-  #
-  #   For example:
-  #
-  #     xml_builder = Builder::XmlMarkup.new
-  #     xml_builder.div { |xml|
-  #       xml.stong("text")
-  #     }
-  #
-  class XmlMarkup < XmlBase
-
-    # Create an XML markup builder.  Parameters are specified by an
-    # option hash.
-    #
-    # :target=><em>target_object</em>::
-    #    Object receiving the markup.  +out+ must respond to the
-    #    <tt><<</tt> operator.  The default is a plain string target.
-    #
-    # :indent=><em>indentation</em>::
-    #    Number of spaces used for indentation.  The default is no
-    #    indentation and no line breaks.
-    #
-    # :margin=><em>initial_indentation_level</em>::
-    #    Amount of initial indentation (specified in levels, not
-    #    spaces).
-    #
-    # :escape_attrs=><b>OBSOLETE</em>::
-    #    The :escape_attrs option is no longer supported by builder
-    #    (and will be quietly ignored).  String attribute values are
-    #    now automatically escaped.  If you need unescaped attribute
-    #    values (perhaps you are using entities in the attribute
-    #    values), then give the value as a Symbol.  This allows much
-    #    finer control over escaping attribute values.
-    #
-    def initialize(options={})
-      indent = options[:indent] || 0
-      margin = options[:margin] || 0
-      super(indent, margin)
-      @target = options[:target] || ""
-    end
-
-    # Return the target of the builder.
-    def target!
-      @target
-    end
-
-    def comment!(comment_text)
-      _ensure_no_block block_given?
-      _special("<!-- ", " -->", comment_text, nil)
-    end
-
-    # Insert an XML declaration into the XML markup.
-    #
-    # For example:
-    #
-    #   xml.declare! :ELEMENT, :blah, "yada"
-    #       # => <!ELEMENT blah "yada">
-    def declare!(inst, *args, &block)
-      _indent
-      @target << "<!#{inst}"
-      args.each do |arg|
-        case arg
-        when String
-          @target << %{ "#{arg}"} # " WART
-        when Symbol
-          @target << " #{arg}"
-        end
-      end
-      if block_given?
-        @target << " ["
-        _newline
-        _nested_structures(block)
-        @target << "]"
-      end
-      @target << ">"
-      _newline
-    end
-
-    # Insert a processing instruction into the XML markup.  E.g.
-    #
-    # For example:
-    #
-    #    xml.instruct!
-    #        #=> <?xml version="1.0" encoding="UTF-8"?>
-    #    xml.instruct! :aaa, :bbb=>"ccc"
-    #        #=> <?aaa bbb="ccc"?>
-    #
-    def instruct!(directive_tag=:xml, attrs={})
-      _ensure_no_block block_given?
-      if directive_tag == :xml
-        a = { :version=>"1.0", :encoding=>"UTF-8" }
-        attrs = a.merge attrs
-      end
-      _special(
-      "<?#{directive_tag}",
-      "?>",
-      nil,
-      attrs,
-      [:version, :encoding, :standalone])
-    end
-
-    # Insert a CDATA section into the XML markup.
-    #
-    # For example:
-    #
-    #    xml.cdata!("text to be included in cdata")
-    #        #=> <![CDATA[text to be included in cdata]]>
-    #
-    def cdata!(text)
-      _ensure_no_block block_given?
-      _special("<![CDATA[", "]]>", text, nil)
-    end
-
-    private
-
-    # NOTE: All private methods of a builder object are prefixed when
-    # a "_" character to avoid possible conflict with XML tag names.
-
-    # Insert text directly in to the builder's target.
-    def _text(text)
-      @target << text
-    end
-
-    # Insert special instruction.
-    def _special(open, close, data=nil, attrs=nil, order=[])
-      _indent
-      @target << open
-      @target << data if data
-      _insert_attributes(attrs, order) if attrs
-      @target << close
-      _newline
-    end
-
-    # Start an XML tag.  If <tt>end_too</tt> is true, then the start
-    # tag is also the end tag (e.g.  <br/>
-    def _start_tag(sym, attrs, end_too=false)
-      @target << "<#{sym}"
-      _insert_attributes(attrs)
-      @target << "/" if end_too
-      @target << ">"
-    end
-
-    # Insert an ending tag.
-    def _end_tag(sym)
-      @target << "</#{sym}>"
-    end
-
-    # Insert the attributes (given in the hash).
-    def _insert_attributes(attrs, order=[])
-      return if attrs.nil?
-      order.each do |k|
-        v = attrs[k]
-        @target << %{ #{k}="#{_attr_value(v)}"} if v # " WART
-      end
-      attrs.each do |k, v|
-        @target << %{ #{k}="#{_attr_value(v)}"} unless order.member?(k) # " WART
-      end
-    end
-
-    def _attr_value(value)
-      case value
-      when Symbol
-        value.to_s
-      else
-        _escape_quote(value.to_s)
-      end
-    end
-
-    def _ensure_no_block(got_block)
-      if got_block
-        fail IllegalBlockError,
-        "Blocks are not allowed on XML instructions"
-      end
-    end
-
-  end
-
-end
diff --git a/activesupport/lib/active_support/vendor/memcache-client-1.7.5/lib/memcache.rb b/activesupport/lib/active_support/vendor/memcache-client-1.7.5/lib/memcache.rb
deleted file mode 100644
index 3fcc388ba0..0000000000
--- a/activesupport/lib/active_support/vendor/memcache-client-1.7.5/lib/memcache.rb
+++ /dev/null
@@ -1,1133 +0,0 @@
-$TESTING = defined?($TESTING) && $TESTING
-
-require 'socket'
-require 'thread'
-require 'zlib'
-require 'digest/sha1'
-require 'net/protocol'
-
-##
-# A Ruby client library for memcached.
-#
-
-class MemCache
-
-  ##
-  # The version of MemCache you are using.
-
-  VERSION = '1.7.5'
-
-  ##
-  # Default options for the cache object.
-
-  DEFAULT_OPTIONS = {
-    :namespace    => nil,
-    :readonly     => false,
-    :multithread  => true,
-    :failover     => true,
-    :timeout      => 0.5,
-    :logger       => nil,
-    :no_reply     => false,
-    :check_size   => true,
-    :autofix_keys => false,
-    :namespace_separator => ':',
-  }
-
-  ##
-  # Default memcached port.
-
-  DEFAULT_PORT = 11211
-
-  ##
-  # Default memcached server weight.
-
-  DEFAULT_WEIGHT = 1
-
-  ##
-  # The namespace for this instance
-
-  attr_reader :namespace
-
-  ##
-  # The multithread setting for this instance
-
-  attr_reader :multithread
-
-  ##
-  # Whether to try to fix keys that are too long and will be truncated by
-  # using their SHA1 hash instead.
-  # The hash is only used on keys longer than 250 characters, or containing spaces,
-  # to avoid impacting performance unnecesarily.
-  #
-  # In theory, your code should generate correct keys when calling memcache, 
-  # so it's your responsibility and you should try to fix this problem at its source.
-  #
-  # But if that's not possible, enable this option and memcache-client will give you a hand.
-  
-  attr_reader :autofix_keys
-  
-  ##
-  # The servers this client talks to.  Play at your own peril.
-
-  attr_reader :servers
-
-  ##
-  # Socket timeout limit with this client, defaults to 0.5 sec.
-  # Set to nil to disable timeouts.
-
-  attr_reader :timeout
-
-  ##
-  # Should the client try to failover to another server if the
-  # first server is down?  Defaults to true.
-
-  attr_reader :failover
-
-  ##
-  # Log debug/info/warn/error to the given Logger, defaults to nil.
-
-  attr_reader :logger
-
-  ##
-  # Don't send or look for a reply from the memcached server for write operations.
-  # Please note this feature only works in memcached 1.2.5 and later.  Earlier
-  # versions will reply with "ERROR".
-  attr_reader :no_reply
-
-  ##
-  # Accepts a list of +servers+ and a list of +opts+.  +servers+ may be
-  # omitted.  See +servers=+ for acceptable server list arguments.
-  #
-  # Valid options for +opts+ are:
-  #
-  #   [:namespace]    Prepends this value to all keys added or retrieved.
-  #   [:readonly]     Raises an exception on cache writes when true.
-  #   [:multithread]  Wraps cache access in a Mutex for thread safety. Defaults to true.
-  #   [:failover]     Should the client try to failover to another server if the
-  #                   first server is down?  Defaults to true.
-  #   [:timeout]      Time to use as the socket read timeout.  Defaults to 0.5 sec,
-  #                   set to nil to disable timeouts.
-  #   [:logger]       Logger to use for info/debug output, defaults to nil
-  #   [:no_reply]     Don't bother looking for a reply for write operations (i.e. they
-  #                   become 'fire and forget'), memcached 1.2.5 and later only, speeds up
-  #                   set/add/delete/incr/decr significantly.
-  #   [:check_size]   Raises a MemCacheError if the value to be set is greater than 1 MB, which
-  #                   is the maximum key size for the standard memcached server.  Defaults to true.
-  #   [:autofix_keys] If a key is longer than 250 characters or contains spaces, 
-  #                   use an SHA1 hash instead, to prevent collisions on truncated keys.
-  # Other options are ignored.
-
-  def initialize(*args)
-    servers = []
-    opts = {}
-
-    case args.length
-    when 0 then # NOP
-    when 1 then
-      arg = args.shift
-      case arg
-      when Hash   then opts = arg
-      when Array  then servers = arg
-      when String then servers = [arg]
-      else raise ArgumentError, 'first argument must be Array, Hash or String'
-      end
-    when 2 then
-      servers, opts = args
-    else
-      raise ArgumentError, "wrong number of arguments (#{args.length} for 2)"
-    end
-
-    opts = DEFAULT_OPTIONS.merge opts
-    @namespace    = opts[:namespace]
-    @readonly     = opts[:readonly]
-    @multithread  = opts[:multithread]
-    @autofix_keys = opts[:autofix_keys]
-    @timeout      = opts[:timeout]
-    @failover     = opts[:failover]
-    @logger       = opts[:logger]
-    @no_reply     = opts[:no_reply]
-    @check_size   = opts[:check_size]
-    @namespace_separator = opts[:namespace_separator]
-    @mutex        = Mutex.new if @multithread
-
-    logger.info { "memcache-client #{VERSION} #{Array(servers).inspect}" } if logger
-
-    Thread.current[:memcache_client] = self.object_id if !@multithread
-
-    self.servers = servers
-  end
-
-  ##
-  # Returns a string representation of the cache object.
-
-  def inspect
-    "<MemCache: %d servers, ns: %p, ro: %p>" %
-      [@servers.length, @namespace, @readonly]
-  end
-
-  ##
-  # Returns whether there is at least one active server for the object.
-
-  def active?
-    not @servers.empty?
-  end
-
-  ##
-  # Returns whether or not the cache object was created read only.
-
-  def readonly?
-    @readonly
-  end
-
-  ##
-  # Set the servers that the requests will be distributed between.  Entries
-  # can be either strings of the form "hostname:port" or
-  # "hostname:port:weight" or MemCache::Server objects.
-  #
-  def servers=(servers)
-    # Create the server objects.
-    @servers = Array(servers).collect do |server|
-      case server
-      when String
-        host, port, weight = server.split ':', 3
-        port ||= DEFAULT_PORT
-        weight ||= DEFAULT_WEIGHT
-        Server.new self, host, port, weight
-      else
-        server
-      end
-    end
-
-    logger.debug { "Servers now: #{@servers.inspect}" } if logger
-
-    # There's no point in doing this if there's only one server
-    @continuum = create_continuum_for(@servers) if @servers.size > 1
-
-    @servers
-  end
-
-  ##
-  # Decrements the value for +key+ by +amount+ and returns the new value.
-  # +key+ must already exist.  If +key+ is not an integer, it is assumed to be
-  # 0.  +key+ can not be decremented below 0.
-
-  def decr(key, amount = 1)
-    raise MemCacheError, "Update of readonly cache" if @readonly
-    with_server(key) do |server, cache_key|
-      cache_decr server, cache_key, amount
-    end
-  rescue TypeError => err
-    handle_error nil, err
-  end
-
-  ##
-  # Retrieves +key+ from memcache.  If +raw+ is false, the value will be
-  # unmarshalled.
-
-  def get(key, raw = false)
-    with_server(key) do |server, cache_key|
-      logger.debug { "get #{key} from #{server.inspect}" } if logger
-      value = cache_get server, cache_key
-      return nil if value.nil?
-      value = Marshal.load value unless raw
-      return value
-    end
-  rescue TypeError => err
-    handle_error nil, err
-  end
-
-  ##
-  # Performs a +get+ with the given +key+.  If 
-  # the value does not exist and a block was given,
-  # the block will be called and the result saved via +add+.
-  #
-  # If you do not provide a block, using this
-  # method is the same as using +get+.
-  #
-  def fetch(key, expiry = 0, raw = false)
-    value = get(key, raw)
-
-    if value.nil? && block_given?
-      value = yield
-      add(key, value, expiry, raw)
-    end
-
-    value
-  end
-
-  ##
-  # Retrieves multiple values from memcached in parallel, if possible.
-  #
-  # The memcached protocol supports the ability to retrieve multiple
-  # keys in a single request.  Pass in an array of keys to this method
-  # and it will:
-  #
-  # 1. map the key to the appropriate memcached server
-  # 2. send a single request to each server that has one or more key values
-  #
-  # Returns a hash of values.
-  #
-  #   cache["a"] = 1
-  #   cache["b"] = 2
-  #   cache.get_multi "a", "b" # => { "a" => 1, "b" => 2 }
-  #
-  # Note that get_multi assumes the values are marshalled.
-
-  def get_multi(*keys)
-    raise MemCacheError, 'No active servers' unless active?
-
-    keys.flatten!
-    key_count = keys.length
-    cache_keys = {}
-    server_keys = Hash.new { |h,k| h[k] = [] }
-
-    # map keys to servers
-    keys.each do |key|
-      server, cache_key = request_setup key
-      cache_keys[cache_key] = key
-      server_keys[server] << cache_key
-    end
-
-    results = {}
-
-    server_keys.each do |server, keys_for_server|
-      keys_for_server_str = keys_for_server.join ' '
-      begin
-        values = cache_get_multi server, keys_for_server_str
-        values.each do |key, value|
-          results[cache_keys[key]] = Marshal.load value
-        end
-      rescue IndexError => e
-        # Ignore this server and try the others
-        logger.warn { "Unable to retrieve #{keys_for_server.size} elements from #{server.inspect}: #{e.message}"} if logger
-      end
-    end
-
-    return results
-  rescue TypeError => err
-    handle_error nil, err
-  end
-
-  ##
-  # Increments the value for +key+ by +amount+ and returns the new value.
-  # +key+ must already exist.  If +key+ is not an integer, it is assumed to be
-  # 0.
-
-  def incr(key, amount = 1)
-    raise MemCacheError, "Update of readonly cache" if @readonly
-    with_server(key) do |server, cache_key|
-      cache_incr server, cache_key, amount
-    end
-  rescue TypeError => err
-    handle_error nil, err
-  end
-
-  ##
-  # Add +key+ to the cache with value +value+ that expires in +expiry+
-  # seconds.  If +raw+ is true, +value+ will not be Marshalled.
-  #
-  # Warning: Readers should not call this method in the event of a cache miss;
-  # see MemCache#add.
-
-  ONE_MB = 1024 * 1024
-
-  def set(key, value, expiry = 0, raw = false)
-    raise MemCacheError, "Update of readonly cache" if @readonly
-
-    value = Marshal.dump value unless raw
-    with_server(key) do |server, cache_key|
-      logger.debug { "set #{key} to #{server.inspect}: #{value.to_s.size}" } if logger
-
-      if @check_size && value.to_s.size > ONE_MB
-        raise MemCacheError, "Value too large, memcached can only store 1MB of data per key"
-      end
-
-      command = "set #{cache_key} 0 #{expiry} #{value.to_s.size}#{noreply}\r\n#{value}\r\n"
-
-      with_socket_management(server) do |socket|
-        socket.write command
-        break nil if @no_reply
-        result = socket.gets
-        raise_on_error_response! result
-
-        if result.nil?
-          server.close
-          raise MemCacheError, "lost connection to #{server.host}:#{server.port}"
-        end
-
-        result
-      end
-    end
-  end
-
-  ##
-  # "cas" is a check and set operation which means "store this data but
-  # only if no one else has updated since I last fetched it."  This can
-  # be used as a form of optimistic locking.
-  #
-  # Works in block form like so:
-  #   cache.cas('some-key') do |value|
-  #     value + 1
-  #   end
-  #
-  # Returns:
-  # +nil+ if the value was not found on the memcached server.
-  # +STORED+ if the value was updated successfully
-  # +EXISTS+ if the value was updated by someone else since last fetch
-
-  def cas(key, expiry=0, raw=false)
-    raise MemCacheError, "Update of readonly cache" if @readonly
-    raise MemCacheError, "A block is required" unless block_given?
-
-    (value, token) = gets(key, raw)
-    return nil unless value
-    updated = yield value
-    value = Marshal.dump updated unless raw
-
-    with_server(key) do |server, cache_key|
-      logger.debug { "cas #{key} to #{server.inspect}: #{value.to_s.size}" } if logger
-      command = "cas #{cache_key} 0 #{expiry} #{value.to_s.size} #{token}#{noreply}\r\n#{value}\r\n"
-
-      with_socket_management(server) do |socket|
-        socket.write command
-        break nil if @no_reply
-        result = socket.gets
-        raise_on_error_response! result
-
-        if result.nil?
-          server.close
-          raise MemCacheError, "lost connection to #{server.host}:#{server.port}"
-        end
-
-        result
-      end
-    end
-  end
-
-  ##
-  # Add +key+ to the cache with value +value+ that expires in +expiry+
-  # seconds, but only if +key+ does not already exist in the cache.
-  # If +raw+ is true, +value+ will not be Marshalled.
-  #
-  # Readers should call this method in the event of a cache miss, not
-  # MemCache#set.
-
-  def add(key, value, expiry = 0, raw = false)
-    raise MemCacheError, "Update of readonly cache" if @readonly
-    value = Marshal.dump value unless raw
-    with_server(key) do |server, cache_key|
-      logger.debug { "add #{key} to #{server}: #{value ? value.to_s.size : 'nil'}" } if logger
-      command = "add #{cache_key} 0 #{expiry} #{value.to_s.size}#{noreply}\r\n#{value}\r\n"
-
-      with_socket_management(server) do |socket|
-        socket.write command
-        break nil if @no_reply
-        result = socket.gets
-        raise_on_error_response! result
-        result
-      end
-    end
-  end
-  
-  ##
-  # Add +key+ to the cache with value +value+ that expires in +expiry+
-  # seconds, but only if +key+ already exists in the cache.
-  # If +raw+ is true, +value+ will not be Marshalled.
-  def replace(key, value, expiry = 0, raw = false)
-    raise MemCacheError, "Update of readonly cache" if @readonly
-    value = Marshal.dump value unless raw
-    with_server(key) do |server, cache_key|
-      logger.debug { "replace #{key} to #{server}: #{value ? value.to_s.size : 'nil'}" } if logger
-      command = "replace #{cache_key} 0 #{expiry} #{value.to_s.size}#{noreply}\r\n#{value}\r\n"
-
-      with_socket_management(server) do |socket|
-        socket.write command
-        break nil if @no_reply
-        result = socket.gets
-        raise_on_error_response! result
-        result
-      end
-    end
-  end
-
-  ##
-  # Append - 'add this data to an existing key after existing data'
-  # Please note the value is always passed to memcached as raw since it
-  # doesn't make a lot of sense to concatenate marshalled data together.
-  def append(key, value)
-    raise MemCacheError, "Update of readonly cache" if @readonly
-    with_server(key) do |server, cache_key|
-      logger.debug { "append #{key} to #{server}: #{value ? value.to_s.size : 'nil'}" } if logger
-      command = "append #{cache_key} 0 0 #{value.to_s.size}#{noreply}\r\n#{value}\r\n"
-
-      with_socket_management(server) do |socket|
-        socket.write command
-        break nil if @no_reply
-        result = socket.gets
-        raise_on_error_response! result
-        result
-      end
-    end
-  end
-
-  ##
-  # Prepend - 'add this data to an existing key before existing data'
-  # Please note the value is always passed to memcached as raw since it
-  # doesn't make a lot of sense to concatenate marshalled data together.
-  def prepend(key, value)
-    raise MemCacheError, "Update of readonly cache" if @readonly
-    with_server(key) do |server, cache_key|
-      logger.debug { "prepend #{key} to #{server}: #{value ? value.to_s.size : 'nil'}" } if logger
-      command = "prepend #{cache_key} 0 0 #{value.to_s.size}#{noreply}\r\n#{value}\r\n"
-
-      with_socket_management(server) do |socket|
-        socket.write command
-        break nil if @no_reply
-        result = socket.gets
-        raise_on_error_response! result
-        result
-      end
-    end
-  end
-
-  ##
-  # Removes +key+ from the cache in +expiry+ seconds.
-
-  def delete(key, expiry = 0)
-    raise MemCacheError, "Update of readonly cache" if @readonly
-    with_server(key) do |server, cache_key|
-      with_socket_management(server) do |socket|
-        logger.debug { "delete #{cache_key} on #{server}" } if logger
-        socket.write "delete #{cache_key} #{expiry}#{noreply}\r\n"
-        break nil if @no_reply
-        result = socket.gets
-        raise_on_error_response! result
-        result
-      end
-    end
-  end
-
-  ##
-  # Flush the cache from all memcache servers.
-  # A non-zero value for +delay+ will ensure that the flush
-  # is propogated slowly through your memcached server farm.
-  # The Nth server will be flushed N*delay seconds from now,
-  # asynchronously so this method returns quickly.
-  # This prevents a huge database spike due to a total
-  # flush all at once.
-
-  def flush_all(delay=0)
-    raise MemCacheError, 'No active servers' unless active?
-    raise MemCacheError, "Update of readonly cache" if @readonly
-
-    begin
-      delay_time = 0
-      @servers.each do |server|
-        with_socket_management(server) do |socket|
-          logger.debug { "flush_all #{delay_time} on #{server}" } if logger
-          if delay == 0 # older versions of memcached will fail silently otherwise
-            socket.write "flush_all#{noreply}\r\n"
-          else
-            socket.write "flush_all #{delay_time}#{noreply}\r\n"
-          end
-          break nil if @no_reply
-          result = socket.gets
-          raise_on_error_response! result
-          result
-        end
-        delay_time += delay
-      end
-    rescue IndexError => err
-      handle_error nil, err
-    end
-  end
-
-  ##
-  # Reset the connection to all memcache servers.  This should be called if
-  # there is a problem with a cache lookup that might have left the connection
-  # in a corrupted state.
-
-  def reset
-    @servers.each { |server| server.close }
-  end
-
-  ##
-  # Returns statistics for each memcached server.  An explanation of the
-  # statistics can be found in the memcached docs:
-  #
-  # http://code.sixapart.com/svn/memcached/trunk/server/doc/protocol.txt
-  #
-  # Example:
-  #
-  #   >> pp CACHE.stats
-  #   {"localhost:11211"=>
-  #     {"bytes"=>4718,
-  #      "pid"=>20188,
-  #      "connection_structures"=>4,
-  #      "time"=>1162278121,
-  #      "pointer_size"=>32,
-  #      "limit_maxbytes"=>67108864,
-  #      "cmd_get"=>14532,
-  #      "version"=>"1.2.0",
-  #      "bytes_written"=>432583,
-  #      "cmd_set"=>32,
-  #      "get_misses"=>0,
-  #      "total_connections"=>19,
-  #      "curr_connections"=>3,
-  #      "curr_items"=>4,
-  #      "uptime"=>1557,
-  #      "get_hits"=>14532,
-  #      "total_items"=>32,
-  #      "rusage_system"=>0.313952,
-  #      "rusage_user"=>0.119981,
-  #      "bytes_read"=>190619}}
-  #   => nil
-
-  def stats
-    raise MemCacheError, "No active servers" unless active?
-    server_stats = {}
-
-    @servers.each do |server|
-      next unless server.alive?
-
-      with_socket_management(server) do |socket|
-        value = nil
-        socket.write "stats\r\n"
-        stats = {}
-        while line = socket.gets do
-          raise_on_error_response! line
-          break if line == "END\r\n"
-          if line =~ /\ASTAT ([\S]+) ([\w\.\:]+)/ then
-            name, value = $1, $2
-            stats[name] = case name
-                          when 'version'
-                            value
-                          when 'rusage_user', 'rusage_system' then
-                            seconds, microseconds = value.split(/:/, 2)
-                            microseconds ||= 0
-                            Float(seconds) + (Float(microseconds) / 1_000_000)
-                          else
-                            if value =~ /\A\d+\Z/ then
-                              value.to_i
-                            else
-                              value
-                            end
-                          end
-          end
-        end
-        server_stats["#{server.host}:#{server.port}"] = stats
-      end
-    end
-
-    raise MemCacheError, "No active servers" if server_stats.empty?
-    server_stats
-  end
-
-  ##
-  # Shortcut to get a value from the cache.
-
-  alias [] get
-
-  ##
-  # Shortcut to save a value in the cache.  This method does not set an
-  # expiration on the entry.  Use set to specify an explicit expiry.
-
-  def []=(key, value)
-    set key, value
-  end
-
-  protected unless $TESTING
-
-  ##
-  # Create a key for the cache, incorporating the namespace qualifier if
-  # requested.
-
-  def make_cache_key(key)
-    if @autofix_keys and (key =~ /\s/ or (key.length + (namespace.nil? ? 0 : namespace.length)) > 250)
-      key = "#{Digest::SHA1.hexdigest(key)}-autofixed"
-    end
-
-    if namespace.nil? then
-      key
-    else
-      "#{@namespace}#{@namespace_separator}#{key}"
-    end
-  end
-
-  ##
-  # Returns an interoperable hash value for +key+.  (I think, docs are
-  # sketchy for down servers).
-
-  def hash_for(key)
-    Zlib.crc32(key)
-  end
-
-  ##
-  # Pick a server to handle the request based on a hash of the key.
-
-  def get_server_for_key(key, options = {})
-    raise ArgumentError, "illegal character in key #{key.inspect}" if
-      key =~ /\s/
-    raise ArgumentError, "key too long #{key.inspect}" if key.length > 250
-    raise MemCacheError, "No servers available" if @servers.empty?
-    return @servers.first if @servers.length == 1
-
-    hkey = hash_for(key)
-
-    20.times do |try|
-      entryidx = Continuum.binary_search(@continuum, hkey)
-      server = @continuum[entryidx].server
-      return server if server.alive?
-      break unless failover
-      hkey = hash_for "#{try}#{key}"
-    end
-    
-    raise MemCacheError, "No servers available"
-  end
-
-  ##
-  # Performs a raw decr for +cache_key+ from +server+.  Returns nil if not
-  # found.
-
-  def cache_decr(server, cache_key, amount)
-    with_socket_management(server) do |socket|
-      socket.write "decr #{cache_key} #{amount}#{noreply}\r\n"
-      break nil if @no_reply
-      text = socket.gets
-      raise_on_error_response! text
-      return nil if text == "NOT_FOUND\r\n"
-      return text.to_i
-    end
-  end
-
-  ##
-  # Fetches the raw data for +cache_key+ from +server+.  Returns nil on cache
-  # miss.
-
-  def cache_get(server, cache_key)
-    with_socket_management(server) do |socket|
-      socket.write "get #{cache_key}\r\n"
-      keyline = socket.gets # "VALUE <key> <flags> <bytes>\r\n"
-
-      if keyline.nil? then
-        server.close
-        raise MemCacheError, "lost connection to #{server.host}:#{server.port}"
-      end
-
-      raise_on_error_response! keyline
-      return nil if keyline == "END\r\n"
-
-      unless keyline =~ /(\d+)\r/ then
-        server.close
-        raise MemCacheError, "unexpected response #{keyline.inspect}"
-      end
-      value = socket.read $1.to_i
-      socket.read 2 # "\r\n"
-      socket.gets   # "END\r\n"
-      return value
-    end
-  end
-
-  def gets(key, raw = false)
-    with_server(key) do |server, cache_key|
-      logger.debug { "gets #{key} from #{server.inspect}" } if logger
-      result = with_socket_management(server) do |socket|
-        socket.write "gets #{cache_key}\r\n"
-        keyline = socket.gets # "VALUE <key> <flags> <bytes> <cas token>\r\n"
-
-        if keyline.nil? then
-          server.close
-          raise MemCacheError, "lost connection to #{server.host}:#{server.port}"
-        end
-
-        raise_on_error_response! keyline
-        return nil if keyline == "END\r\n"
-
-        unless keyline =~ /(\d+) (\w+)\r/ then
-          server.close
-          raise MemCacheError, "unexpected response #{keyline.inspect}"
-        end
-        value = socket.read $1.to_i
-        socket.read 2 # "\r\n"
-        socket.gets   # "END\r\n"
-        [value, $2]
-      end
-      result[0] = Marshal.load result[0] unless raw
-      result
-    end
-  rescue TypeError => err
-    handle_error nil, err
-  end
-
-
-  ##
-  # Fetches +cache_keys+ from +server+ using a multi-get.
-
-  def cache_get_multi(server, cache_keys)
-    with_socket_management(server) do |socket|
-      values = {}
-      socket.write "get #{cache_keys}\r\n"
-
-      while keyline = socket.gets do
-        return values if keyline == "END\r\n"
-        raise_on_error_response! keyline
-
-        unless keyline =~ /\AVALUE (.+) (.+) (.+)/ then
-          server.close
-          raise MemCacheError, "unexpected response #{keyline.inspect}"
-        end
-
-        key, data_length = $1, $3
-        values[$1] = socket.read data_length.to_i
-        socket.read(2) # "\r\n"
-      end
-
-      server.close
-      raise MemCacheError, "lost connection to #{server.host}:#{server.port}" # TODO: retry here too
-    end
-  end
-
-  ##
-  # Performs a raw incr for +cache_key+ from +server+.  Returns nil if not
-  # found.
-
-  def cache_incr(server, cache_key, amount)
-    with_socket_management(server) do |socket|
-      socket.write "incr #{cache_key} #{amount}#{noreply}\r\n"
-      break nil if @no_reply
-      text = socket.gets
-      raise_on_error_response! text
-      return nil if text == "NOT_FOUND\r\n"
-      return text.to_i
-    end
-  end
-
-  ##
-  # Gets or creates a socket connected to the given server, and yields it
-  # to the block, wrapped in a mutex synchronization if @multithread is true.
-  #
-  # If a socket error (SocketError, SystemCallError, IOError) or protocol error
-  # (MemCacheError) is raised by the block, closes the socket, attempts to
-  # connect again, and retries the block (once).  If an error is again raised,
-  # reraises it as MemCacheError.
-  #
-  # If unable to connect to the server (or if in the reconnect wait period),
-  # raises MemCacheError.  Note that the socket connect code marks a server
-  # dead for a timeout period, so retrying does not apply to connection attempt
-  # failures (but does still apply to unexpectedly lost connections etc.).
-
-  def with_socket_management(server, &block)
-    check_multithread_status!
-
-    @mutex.lock if @multithread
-    retried = false
-
-    begin
-      socket = server.socket
-
-      # Raise an IndexError to show this server is out of whack. If were inside
-      # a with_server block, we'll catch it and attempt to restart the operation.
-
-      raise IndexError, "No connection to server (#{server.status})" if socket.nil?
-
-      block.call(socket)
-
-    rescue SocketError, Errno::EAGAIN, Timeout::Error => err
-      logger.warn { "Socket failure: #{err.message}" } if logger
-      server.mark_dead(err)
-      handle_error(server, err)
-
-    rescue MemCacheError, SystemCallError, IOError => err
-      logger.warn { "Generic failure: #{err.class.name}: #{err.message}" } if logger
-      handle_error(server, err) if retried || socket.nil?
-      retried = true
-      retry
-    end
-  ensure
-    @mutex.unlock if @multithread
-  end
-
-  def with_server(key)
-    retried = false
-    begin
-      server, cache_key = request_setup(key)
-      yield server, cache_key
-    rescue IndexError => e
-      logger.warn { "Server failed: #{e.class.name}: #{e.message}" } if logger
-      if !retried && @servers.size > 1
-        logger.info { "Connection to server #{server.inspect} DIED! Retrying operation..." } if logger
-        retried = true
-        retry
-      end
-      handle_error(nil, e)
-    end
-  end
-
-  ##
-  # Handles +error+ from +server+.
-
-  def handle_error(server, error)
-    raise error if error.is_a?(MemCacheError)
-    server.close if server
-    new_error = MemCacheError.new error.message
-    new_error.set_backtrace error.backtrace
-    raise new_error
-  end
-
-  def noreply
-    @no_reply ? ' noreply' : ''
-  end
-
-  ##
-  # Performs setup for making a request with +key+ from memcached.  Returns
-  # the server to fetch the key from and the complete key to use.
-
-  def request_setup(key)
-    raise MemCacheError, 'No active servers' unless active?
-    cache_key = make_cache_key key
-    server = get_server_for_key cache_key
-    return server, cache_key
-  end
-
-  def raise_on_error_response!(response)
-    if response =~ /\A(?:CLIENT_|SERVER_)?ERROR(.*)/
-      raise MemCacheError, $1.strip
-    end
-  end
-
-  def create_continuum_for(servers)
-    total_weight = servers.inject(0) { |memo, srv| memo + srv.weight }
-    continuum = []
-
-    servers.each do |server|
-      entry_count_for(server, servers.size, total_weight).times do |idx|
-        hash = Digest::SHA1.hexdigest("#{server.host}:#{server.port}:#{idx}")
-        value = Integer("0x#{hash[0..7]}")
-        continuum << Continuum::Entry.new(value, server)
-      end
-    end
-
-    continuum.sort { |a, b| a.value <=> b.value }
-  end
-
-  def entry_count_for(server, total_servers, total_weight)
-    ((total_servers * Continuum::POINTS_PER_SERVER * server.weight) / Float(total_weight)).floor
-  end
-
-  def check_multithread_status!
-    return if @multithread
-
-    if Thread.current[:memcache_client] != self.object_id
-      raise MemCacheError, <<-EOM
-        You are accessing this memcache-client instance from multiple threads but have not enabled multithread support.
-        Normally:  MemCache.new(['localhost:11211'], :multithread => true)
-        In Rails:  config.cache_store = [:mem_cache_store, 'localhost:11211', { :multithread => true }]
-      EOM
-    end
-  end
-
-  ##
-  # This class represents a memcached server instance.
-
-  class Server
-
-    ##
-    # The amount of time to wait before attempting to re-establish a
-    # connection with a server that is marked dead.
-
-    RETRY_DELAY = 30.0
-
-    ##
-    # The host the memcached server is running on.
-
-    attr_reader :host
-
-    ##
-    # The port the memcached server is listening on.
-
-    attr_reader :port
-
-    ##
-    # The weight given to the server.
-
-    attr_reader :weight
-
-    ##
-    # The time of next retry if the connection is dead.
-
-    attr_reader :retry
-
-    ##
-    # A text status string describing the state of the server.
-
-    attr_reader :status
-
-    attr_reader :logger
-
-    ##
-    # Create a new MemCache::Server object for the memcached instance
-    # listening on the given host and port, weighted by the given weight.
-
-    def initialize(memcache, host, port = DEFAULT_PORT, weight = DEFAULT_WEIGHT)
-      raise ArgumentError, "No host specified" if host.nil? or host.empty?
-      raise ArgumentError, "No port specified" if port.nil? or port.to_i.zero?
-
-      @host   = host
-      @port   = port.to_i
-      @weight = weight.to_i
-
-      @sock   = nil
-      @retry  = nil
-      @status = 'NOT CONNECTED'
-      @timeout = memcache.timeout
-      @logger = memcache.logger
-    end
-
-    ##
-    # Return a string representation of the server object.
-
-    def inspect
-      "<MemCache::Server: %s:%d [%d] (%s)>" % [@host, @port, @weight, @status]
-    end
-
-    ##
-    # Check whether the server connection is alive.  This will cause the
-    # socket to attempt to connect if it isn't already connected and or if
-    # the server was previously marked as down and the retry time has
-    # been exceeded.
-
-    def alive?
-      !!socket
-    end
-
-    ##
-    # Try to connect to the memcached server targeted by this object.
-    # Returns the connected socket object on success or nil on failure.
-
-    def socket
-      return @sock if @sock and not @sock.closed?
-
-      @sock = nil
-
-      # If the host was dead, don't retry for a while.
-      return if @retry and @retry > Time.now
-
-      # Attempt to connect if not already connected.
-      begin
-        @sock = connect_to(@host, @port, @timeout)
-        @sock.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
-        @retry  = nil
-        @status = 'CONNECTED'
-      rescue SocketError, SystemCallError, IOError => err
-        logger.warn { "Unable to open socket: #{err.class.name}, #{err.message}" } if logger
-        mark_dead err
-      end
-
-      return @sock
-    end
-
-    def connect_to(host, port, timeout=nil)
-      io = MemCache::BufferedIO.new(TCPSocket.new(host, port))
-      io.read_timeout = timeout
-      io
-    end
-
-    ##
-    # Close the connection to the memcached server targeted by this
-    # object.  The server is not considered dead.
-
-    def close
-      @sock.close if @sock && !@sock.closed?
-      @sock   = nil
-      @retry  = nil
-      @status = "NOT CONNECTED"
-    end
-
-    ##
-    # Mark the server as dead and close its socket.
-
-    def mark_dead(error)
-      @sock.close if @sock && !@sock.closed?
-      @sock   = nil
-      @retry  = Time.now + RETRY_DELAY
-
-      reason = "#{error.class.name}: #{error.message}"
-      @status = sprintf "%s:%s DEAD (%s), will retry at %s", @host, @port, reason, @retry
-      @logger.info { @status } if @logger
-    end
-
-  end
-
-  ##
-  # Base MemCache exception class.
-
-  class MemCacheError < RuntimeError; end
-
-  class BufferedIO < Net::BufferedIO # :nodoc:
-    BUFSIZE = 1024 * 16
-
-    if RUBY_VERSION < '1.9.1'
-      def rbuf_fill
-        begin
-          @rbuf << @io.read_nonblock(BUFSIZE)
-        rescue Errno::EWOULDBLOCK
-          retry unless @read_timeout
-          if IO.select([@io], nil, nil, @read_timeout)
-            retry
-          else
-            raise Timeout::Error, 'IO timeout'
-          end
-        end
-      end
-    end
-
-    def setsockopt(*args)
-      @io.setsockopt(*args)
-    end
-
-    def gets
-      readuntil("\n")
-    end
-  end
-
-end
-
-module Continuum
-  POINTS_PER_SERVER = 160 # this is the default in libmemcached
-
-  # Find the closest index in Continuum with value <= the given value
-  def self.binary_search(ary, value, &block)
-    upper = ary.size - 1
-    lower = 0
-    idx = 0
-
-    while(lower <= upper) do
-      idx = (lower + upper) / 2
-      comp = ary[idx].value <=> value
-
-      if comp == 0
-        return idx
-      elsif comp > 0
-        upper = idx - 1
-      else
-        lower = idx + 1
-      end
-    end
-    return upper
-  end
-
-  class Entry
-    attr_reader :value
-    attr_reader :server
-
-    def initialize(val, srv)
-      @value = val
-      @server = srv
-    end
-
-    def inspect
-      "<#{value}, #{server.host}:#{server.port}>"
-    end
-  end
-
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo.rb
deleted file mode 100644
index c8bdbeec5d..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#--
-# Copyright (c) 2005-2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-# Add the directory containing this file to the start of the load path if it
-# isn't there already.
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
-require 'tzinfo/timezone'
-# require 'tzinfo/country'
-# require 'tzinfo/tzdataparser'
-# require 'tzinfo/timezone_proxy'
-require 'tzinfo/data_timezone'
-require 'tzinfo/linked_timezone'
\ No newline at end of file
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/data_timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/data_timezone.rb
deleted file mode 100644
index 5eccbdf0db..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/data_timezone.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/info_timezone'
-
-module TZInfo
-
-  # A Timezone based on a DataTimezoneInfo.
-  class DataTimezone < InfoTimezone #:nodoc:
-    
-    # Returns the TimezonePeriod for the given UTC time. utc can either be
-    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
-    # information in utc is ignored (it is treated as a UTC time).        
-    #
-    # If no TimezonePeriod could be found, PeriodNotFound is raised.
-    def period_for_utc(utc)
-      info.period_for_utc(utc)
-    end
-    
-    # Returns the set of TimezonePeriod instances that are valid for the given
-    # local time as an array. If you just want a single period, use 
-    # period_for_local instead and specify how abiguities should be resolved.
-    # Raises PeriodNotFound if no periods are found for the given time.
-    def periods_for_local(local)
-      info.periods_for_local(local)
-    end    
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/data_timezone_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/data_timezone_info.rb
deleted file mode 100644
index a45d94554b..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/data_timezone_info.rb
+++ /dev/null
@@ -1,228 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/time_or_datetime'
-require 'tzinfo/timezone_info'
-require 'tzinfo/timezone_offset_info'
-require 'tzinfo/timezone_period'
-require 'tzinfo/timezone_transition_info'
-
-module TZInfo
-  # Thrown if no offsets have been defined when calling period_for_utc or
-  # periods_for_local. Indicates an error in the timezone data.
-  class NoOffsetsDefined < StandardError
-  end
-    
-  # Represents a (non-linked) timezone defined in a data module.
-  class DataTimezoneInfo < TimezoneInfo #:nodoc:
-            
-    # Constructs a new TimezoneInfo with its identifier.
-    def initialize(identifier)   
-      super(identifier)
-      @offsets = {}
-      @transitions = []
-      @previous_offset = nil
-      @transitions_index = nil
-    end
- 
-    # Defines a offset. The id uniquely identifies this offset within the
-    # timezone. utc_offset and std_offset define the offset in seconds of 
-    # standard time from UTC and daylight savings from standard time 
-    # respectively. abbreviation describes the timezone offset (e.g. GMT, BST,
-    # EST or EDT).
-    #
-    # The first offset to be defined is treated as the offset that applies
-    # until the first transition. This will usually be in Local Mean Time (LMT).
-    #
-    # ArgumentError will be raised if the id is already defined.
-    def offset(id, utc_offset, std_offset, abbreviation)
-      raise ArgumentError, 'Offset already defined' if @offsets.has_key?(id)
-      
-      offset = TimezoneOffsetInfo.new(utc_offset, std_offset, abbreviation)
-      @offsets[id] = offset
-      @previous_offset = offset unless @previous_offset
-    end
-    
-    # Defines a transition. Transitions must be defined in chronological order.
-    # ArgumentError will be raised if a transition is added out of order.
-    # offset_id refers to an id defined with offset. ArgumentError will be 
-    # raised if the offset_id cannot be found. numerator_or_time and
-    # denomiator specify the time the transition occurs as. See 
-    # TimezoneTransitionInfo for more detail about specifying times.
-    def transition(year, month, offset_id, numerator_or_time, denominator = nil)
-      offset = @offsets[offset_id]      
-      raise ArgumentError, 'Offset not found' unless offset
-            
-      if @transitions_index
-        if year < @last_year || (year == @last_year && month < @last_month)
-          raise ArgumentError, 'Transitions must be increasing date order'
-        end
-        
-        # Record the position of the first transition with this index.
-        index = transition_index(year, month)
-        @transitions_index[index] ||= @transitions.length
-                
-        # Fill in any gaps       
-        (index - 1).downto(0) do |i|
-          break if @transitions_index[i]
-          @transitions_index[i] = @transitions.length
-        end
-      else
-        @transitions_index = [@transitions.length]
-        @start_year = year
-        @start_month = month        
-      end
-      
-      @transitions << TimezoneTransitionInfo.new(offset, @previous_offset, 
-        numerator_or_time, denominator)
-      @last_year = year
-      @last_month = month             
-      @previous_offset = offset
-    end           
-    
-    # Returns the TimezonePeriod for the given UTC time.
-    # Raises NoOffsetsDefined if no offsets have been defined.
-    def period_for_utc(utc)
-      unless @transitions.empty?
-        utc = TimeOrDateTime.wrap(utc)               
-        index = transition_index(utc.year, utc.mon)
-        
-        start_transition = nil
-        start = transition_before_end(index)
-        if start
-          start.downto(0) do |i|
-            if @transitions[i].at <= utc
-              start_transition = @transitions[i]
-              break
-            end
-          end
-        end
-        
-        end_transition = nil
-        start = transition_after_start(index)      
-        if start
-          start.upto(@transitions.length - 1) do |i|
-            if @transitions[i].at > utc
-              end_transition = @transitions[i]
-              break
-            end
-          end
-        end
-               
-        if start_transition || end_transition
-          TimezonePeriod.new(start_transition, end_transition)
-        else
-          # Won't happen since there are transitions. Must always find one
-          # transition that is either >= or < the specified time.
-          raise 'No transitions found in search'
-        end        
-      else
-        raise NoOffsetsDefined, 'No offsets have been defined' unless @previous_offset        
-        TimezonePeriod.new(nil, nil, @previous_offset)
-      end
-    end
-    
-    # Returns the set of TimezonePeriods for the given local time as an array.    
-    # Results returned are ordered by increasing UTC start date.
-    # Returns an empty array if no periods are found for the given time.
-    # Raises NoOffsetsDefined if no offsets have been defined.    
-    def periods_for_local(local)
-      unless @transitions.empty?
-        local = TimeOrDateTime.wrap(local)
-        index = transition_index(local.year, local.mon)
-        
-        result = []
-       
-        start_index = transition_after_start(index - 1)       
-        if start_index && @transitions[start_index].local_end > local           
-          if start_index > 0
-            if @transitions[start_index - 1].local_start <= local 
-              result << TimezonePeriod.new(@transitions[start_index - 1], @transitions[start_index])
-            end
-          else
-            result << TimezonePeriod.new(nil, @transitions[start_index])
-          end
-        end
-        
-        end_index = transition_before_end(index + 1)
-        
-        if end_index        
-          start_index = end_index unless start_index
-          
-          start_index.upto(transition_before_end(index + 1)) do |i|
-            if @transitions[i].local_start <= local
-              if i + 1 < @transitions.length
-                if @transitions[i + 1].local_end > local
-                  result << TimezonePeriod.new(@transitions[i], @transitions[i + 1])
-                end
-              else
-                result << TimezonePeriod.new(@transitions[i], nil)
-              end
-            end
-          end
-        end
-        
-        result
-      else
-        raise NoOffsetsDefined, 'No offsets have been defined' unless @previous_offset
-        [TimezonePeriod.new(nil, nil, @previous_offset)]
-      end
-    end
-    
-    private
-      # Returns the index into the @transitions_index array for a given year 
-      # and month.
-      def transition_index(year, month)
-        index = (year - @start_year) * 2
-        index += 1 if month > 6
-        index -= 1 if @start_month > 6
-        index
-      end
-      
-      # Returns the index into @transitions of the first transition that occurs
-      # on or after the start of the given index into @transitions_index.
-      # Returns nil if there are no such transitions.
-      def transition_after_start(index)
-        if index >= @transitions_index.length
-          nil
-        else
-          index = 0 if index < 0
-          @transitions_index[index]
-        end
-      end
-      
-      # Returns the index into @transitions of the first transition that occurs
-      # before the end of the given index into @transitions_index.
-      # Returns nil if there are no such transitions.
-      def transition_before_end(index)
-        index = index + 1
-        
-        if index <= 0
-          nil
-        elsif index >= @transitions_index.length          
-          @transitions.length - 1
-        else      
-          @transitions_index[index] - 1          
-        end
-      end            
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Algiers.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Algiers.rb
deleted file mode 100644
index 8c5f25577f..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Algiers.rb
+++ /dev/null
@@ -1,55 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Algiers
-        include TimezoneDefinition
-        
-        timezone 'Africa/Algiers' do |tz|
-          tz.offset :o0, 732, 0, :LMT
-          tz.offset :o1, 561, 0, :PMT
-          tz.offset :o2, 0, 0, :WET
-          tz.offset :o3, 0, 3600, :WEST
-          tz.offset :o4, 3600, 0, :CET
-          tz.offset :o5, 3600, 3600, :CEST
-          
-          tz.transition 1891, 3, :o1, 2170625843, 900
-          tz.transition 1911, 3, :o2, 69670267013, 28800
-          tz.transition 1916, 6, :o3, 58104707, 24
-          tz.transition 1916, 10, :o2, 58107323, 24
-          tz.transition 1917, 3, :o3, 58111499, 24
-          tz.transition 1917, 10, :o2, 58116227, 24
-          tz.transition 1918, 3, :o3, 58119899, 24
-          tz.transition 1918, 10, :o2, 58124963, 24
-          tz.transition 1919, 3, :o3, 58128467, 24
-          tz.transition 1919, 10, :o2, 58133699, 24
-          tz.transition 1920, 2, :o3, 58136867, 24
-          tz.transition 1920, 10, :o2, 58142915, 24
-          tz.transition 1921, 3, :o3, 58146323, 24
-          tz.transition 1921, 6, :o2, 58148699, 24
-          tz.transition 1939, 9, :o3, 58308443, 24
-          tz.transition 1939, 11, :o2, 4859173, 2
-          tz.transition 1940, 2, :o4, 29156215, 12
-          tz.transition 1944, 4, :o5, 58348405, 24
-          tz.transition 1944, 10, :o4, 4862743, 2
-          tz.transition 1945, 4, :o5, 58357141, 24
-          tz.transition 1945, 9, :o4, 58361147, 24
-          tz.transition 1946, 10, :o2, 58370411, 24
-          tz.transition 1956, 1, :o4, 4871003, 2
-          tz.transition 1963, 4, :o2, 58515203, 24
-          tz.transition 1971, 4, :o3, 41468400
-          tz.transition 1971, 9, :o2, 54774000
-          tz.transition 1977, 5, :o3, 231724800
-          tz.transition 1977, 10, :o4, 246236400
-          tz.transition 1978, 3, :o5, 259545600
-          tz.transition 1978, 9, :o4, 275274000
-          tz.transition 1979, 10, :o2, 309740400
-          tz.transition 1980, 4, :o3, 325468800
-          tz.transition 1980, 10, :o2, 341802000
-          tz.transition 1981, 5, :o4, 357523200
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Cairo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Cairo.rb
deleted file mode 100644
index b7ed8e8244..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Cairo.rb
+++ /dev/null
@@ -1,219 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Cairo
-        include TimezoneDefinition
-        
-        timezone 'Africa/Cairo' do |tz|
-          tz.offset :o0, 7500, 0, :LMT
-          tz.offset :o1, 7200, 0, :EET
-          tz.offset :o2, 7200, 3600, :EEST
-          
-          tz.transition 1900, 9, :o1, 695604503, 288
-          tz.transition 1940, 7, :o2, 29157905, 12
-          tz.transition 1940, 9, :o1, 19439227, 8
-          tz.transition 1941, 4, :o2, 29161193, 12
-          tz.transition 1941, 9, :o1, 19442027, 8
-          tz.transition 1942, 3, :o2, 29165405, 12
-          tz.transition 1942, 10, :o1, 19445275, 8
-          tz.transition 1943, 3, :o2, 29169785, 12
-          tz.transition 1943, 10, :o1, 19448235, 8
-          tz.transition 1944, 3, :o2, 29174177, 12
-          tz.transition 1944, 10, :o1, 19451163, 8
-          tz.transition 1945, 4, :o2, 29178737, 12
-          tz.transition 1945, 10, :o1, 19454083, 8
-          tz.transition 1957, 5, :o2, 29231621, 12
-          tz.transition 1957, 9, :o1, 19488899, 8
-          tz.transition 1958, 4, :o2, 29235893, 12
-          tz.transition 1958, 9, :o1, 19491819, 8
-          tz.transition 1959, 4, :o2, 58480547, 24
-          tz.transition 1959, 9, :o1, 4873683, 2
-          tz.transition 1960, 4, :o2, 58489331, 24
-          tz.transition 1960, 9, :o1, 4874415, 2
-          tz.transition 1961, 4, :o2, 58498091, 24
-          tz.transition 1961, 9, :o1, 4875145, 2
-          tz.transition 1962, 4, :o2, 58506851, 24
-          tz.transition 1962, 9, :o1, 4875875, 2
-          tz.transition 1963, 4, :o2, 58515611, 24
-          tz.transition 1963, 9, :o1, 4876605, 2
-          tz.transition 1964, 4, :o2, 58524395, 24
-          tz.transition 1964, 9, :o1, 4877337, 2
-          tz.transition 1965, 4, :o2, 58533155, 24
-          tz.transition 1965, 9, :o1, 4878067, 2
-          tz.transition 1966, 4, :o2, 58541915, 24
-          tz.transition 1966, 10, :o1, 4878799, 2
-          tz.transition 1967, 4, :o2, 58550675, 24
-          tz.transition 1967, 10, :o1, 4879529, 2
-          tz.transition 1968, 4, :o2, 58559459, 24
-          tz.transition 1968, 10, :o1, 4880261, 2
-          tz.transition 1969, 4, :o2, 58568219, 24
-          tz.transition 1969, 10, :o1, 4880991, 2
-          tz.transition 1970, 4, :o2, 10364400
-          tz.transition 1970, 10, :o1, 23587200
-          tz.transition 1971, 4, :o2, 41900400
-          tz.transition 1971, 10, :o1, 55123200
-          tz.transition 1972, 4, :o2, 73522800
-          tz.transition 1972, 10, :o1, 86745600
-          tz.transition 1973, 4, :o2, 105058800
-          tz.transition 1973, 10, :o1, 118281600
-          tz.transition 1974, 4, :o2, 136594800
-          tz.transition 1974, 10, :o1, 149817600
-          tz.transition 1975, 4, :o2, 168130800
-          tz.transition 1975, 10, :o1, 181353600
-          tz.transition 1976, 4, :o2, 199753200
-          tz.transition 1976, 10, :o1, 212976000
-          tz.transition 1977, 4, :o2, 231289200
-          tz.transition 1977, 10, :o1, 244512000
-          tz.transition 1978, 4, :o2, 262825200
-          tz.transition 1978, 10, :o1, 276048000
-          tz.transition 1979, 4, :o2, 294361200
-          tz.transition 1979, 10, :o1, 307584000
-          tz.transition 1980, 4, :o2, 325983600
-          tz.transition 1980, 10, :o1, 339206400
-          tz.transition 1981, 4, :o2, 357519600
-          tz.transition 1981, 10, :o1, 370742400
-          tz.transition 1982, 7, :o2, 396399600
-          tz.transition 1982, 10, :o1, 402278400
-          tz.transition 1983, 7, :o2, 426812400
-          tz.transition 1983, 10, :o1, 433814400
-          tz.transition 1984, 4, :o2, 452214000
-          tz.transition 1984, 10, :o1, 465436800
-          tz.transition 1985, 4, :o2, 483750000
-          tz.transition 1985, 10, :o1, 496972800
-          tz.transition 1986, 4, :o2, 515286000
-          tz.transition 1986, 10, :o1, 528508800
-          tz.transition 1987, 4, :o2, 546822000
-          tz.transition 1987, 10, :o1, 560044800
-          tz.transition 1988, 4, :o2, 578444400
-          tz.transition 1988, 10, :o1, 591667200
-          tz.transition 1989, 5, :o2, 610412400
-          tz.transition 1989, 10, :o1, 623203200
-          tz.transition 1990, 4, :o2, 641516400
-          tz.transition 1990, 10, :o1, 654739200
-          tz.transition 1991, 4, :o2, 673052400
-          tz.transition 1991, 10, :o1, 686275200
-          tz.transition 1992, 4, :o2, 704674800
-          tz.transition 1992, 10, :o1, 717897600
-          tz.transition 1993, 4, :o2, 736210800
-          tz.transition 1993, 10, :o1, 749433600
-          tz.transition 1994, 4, :o2, 767746800
-          tz.transition 1994, 10, :o1, 780969600
-          tz.transition 1995, 4, :o2, 799020000
-          tz.transition 1995, 9, :o1, 812322000
-          tz.transition 1996, 4, :o2, 830469600
-          tz.transition 1996, 9, :o1, 843771600
-          tz.transition 1997, 4, :o2, 861919200
-          tz.transition 1997, 9, :o1, 875221200
-          tz.transition 1998, 4, :o2, 893368800
-          tz.transition 1998, 9, :o1, 906670800
-          tz.transition 1999, 4, :o2, 925423200
-          tz.transition 1999, 9, :o1, 938725200
-          tz.transition 2000, 4, :o2, 956872800
-          tz.transition 2000, 9, :o1, 970174800
-          tz.transition 2001, 4, :o2, 988322400
-          tz.transition 2001, 9, :o1, 1001624400
-          tz.transition 2002, 4, :o2, 1019772000
-          tz.transition 2002, 9, :o1, 1033074000
-          tz.transition 2003, 4, :o2, 1051221600
-          tz.transition 2003, 9, :o1, 1064523600
-          tz.transition 2004, 4, :o2, 1083276000
-          tz.transition 2004, 9, :o1, 1096578000
-          tz.transition 2005, 4, :o2, 1114725600
-          tz.transition 2005, 9, :o1, 1128027600
-          tz.transition 2006, 4, :o2, 1146175200
-          tz.transition 2006, 9, :o1, 1158872400
-          tz.transition 2007, 4, :o2, 1177624800
-          tz.transition 2007, 9, :o1, 1189112400
-          tz.transition 2008, 4, :o2, 1209074400
-          tz.transition 2008, 8, :o1, 1219957200
-          tz.transition 2009, 4, :o2, 1240524000
-          tz.transition 2009, 8, :o1, 1250802000
-          tz.transition 2010, 4, :o2, 1272578400
-          tz.transition 2010, 9, :o1, 1285880400
-          tz.transition 2011, 4, :o2, 1304028000
-          tz.transition 2011, 9, :o1, 1317330000
-          tz.transition 2012, 4, :o2, 1335477600
-          tz.transition 2012, 9, :o1, 1348779600
-          tz.transition 2013, 4, :o2, 1366927200
-          tz.transition 2013, 9, :o1, 1380229200
-          tz.transition 2014, 4, :o2, 1398376800
-          tz.transition 2014, 9, :o1, 1411678800
-          tz.transition 2015, 4, :o2, 1429826400
-          tz.transition 2015, 9, :o1, 1443128400
-          tz.transition 2016, 4, :o2, 1461880800
-          tz.transition 2016, 9, :o1, 1475182800
-          tz.transition 2017, 4, :o2, 1493330400
-          tz.transition 2017, 9, :o1, 1506632400
-          tz.transition 2018, 4, :o2, 1524780000
-          tz.transition 2018, 9, :o1, 1538082000
-          tz.transition 2019, 4, :o2, 1556229600
-          tz.transition 2019, 9, :o1, 1569531600
-          tz.transition 2020, 4, :o2, 1587679200
-          tz.transition 2020, 9, :o1, 1600981200
-          tz.transition 2021, 4, :o2, 1619733600
-          tz.transition 2021, 9, :o1, 1633035600
-          tz.transition 2022, 4, :o2, 1651183200
-          tz.transition 2022, 9, :o1, 1664485200
-          tz.transition 2023, 4, :o2, 1682632800
-          tz.transition 2023, 9, :o1, 1695934800
-          tz.transition 2024, 4, :o2, 1714082400
-          tz.transition 2024, 9, :o1, 1727384400
-          tz.transition 2025, 4, :o2, 1745532000
-          tz.transition 2025, 9, :o1, 1758834000
-          tz.transition 2026, 4, :o2, 1776981600
-          tz.transition 2026, 9, :o1, 1790283600
-          tz.transition 2027, 4, :o2, 1809036000
-          tz.transition 2027, 9, :o1, 1822338000
-          tz.transition 2028, 4, :o2, 1840485600
-          tz.transition 2028, 9, :o1, 1853787600
-          tz.transition 2029, 4, :o2, 1871935200
-          tz.transition 2029, 9, :o1, 1885237200
-          tz.transition 2030, 4, :o2, 1903384800
-          tz.transition 2030, 9, :o1, 1916686800
-          tz.transition 2031, 4, :o2, 1934834400
-          tz.transition 2031, 9, :o1, 1948136400
-          tz.transition 2032, 4, :o2, 1966888800
-          tz.transition 2032, 9, :o1, 1980190800
-          tz.transition 2033, 4, :o2, 1998338400
-          tz.transition 2033, 9, :o1, 2011640400
-          tz.transition 2034, 4, :o2, 2029788000
-          tz.transition 2034, 9, :o1, 2043090000
-          tz.transition 2035, 4, :o2, 2061237600
-          tz.transition 2035, 9, :o1, 2074539600
-          tz.transition 2036, 4, :o2, 2092687200
-          tz.transition 2036, 9, :o1, 2105989200
-          tz.transition 2037, 4, :o2, 2124136800
-          tz.transition 2037, 9, :o1, 2137438800
-          tz.transition 2038, 4, :o2, 29586521, 12
-          tz.transition 2038, 9, :o1, 19725579, 8
-          tz.transition 2039, 4, :o2, 29590889, 12
-          tz.transition 2039, 9, :o1, 19728491, 8
-          tz.transition 2040, 4, :o2, 29595257, 12
-          tz.transition 2040, 9, :o1, 19731403, 8
-          tz.transition 2041, 4, :o2, 29599625, 12
-          tz.transition 2041, 9, :o1, 19734315, 8
-          tz.transition 2042, 4, :o2, 29603993, 12
-          tz.transition 2042, 9, :o1, 19737227, 8
-          tz.transition 2043, 4, :o2, 29608361, 12
-          tz.transition 2043, 9, :o1, 19740139, 8
-          tz.transition 2044, 4, :o2, 29612813, 12
-          tz.transition 2044, 9, :o1, 19743107, 8
-          tz.transition 2045, 4, :o2, 29617181, 12
-          tz.transition 2045, 9, :o1, 19746019, 8
-          tz.transition 2046, 4, :o2, 29621549, 12
-          tz.transition 2046, 9, :o1, 19748931, 8
-          tz.transition 2047, 4, :o2, 29625917, 12
-          tz.transition 2047, 9, :o1, 19751843, 8
-          tz.transition 2048, 4, :o2, 29630285, 12
-          tz.transition 2048, 9, :o1, 19754755, 8
-          tz.transition 2049, 4, :o2, 29634737, 12
-          tz.transition 2049, 9, :o1, 19757723, 8
-          tz.transition 2050, 4, :o2, 29639105, 12
-          tz.transition 2050, 9, :o1, 19760635, 8
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Casablanca.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Casablanca.rb
deleted file mode 100644
index 18d73c93a0..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Casablanca.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Casablanca
-        include TimezoneDefinition
-        
-        timezone 'Africa/Casablanca' do |tz|
-          tz.offset :o0, -1820, 0, :LMT
-          tz.offset :o1, 0, 0, :WET
-          tz.offset :o2, 0, 3600, :WEST
-          tz.offset :o3, 3600, 0, :CET
-          
-          tz.transition 1913, 10, :o1, 10454687371, 4320
-          tz.transition 1939, 9, :o2, 4859037, 2
-          tz.transition 1939, 11, :o1, 58310075, 24
-          tz.transition 1940, 2, :o2, 4859369, 2
-          tz.transition 1945, 11, :o1, 58362659, 24
-          tz.transition 1950, 6, :o2, 4866887, 2
-          tz.transition 1950, 10, :o1, 58406003, 24
-          tz.transition 1967, 6, :o2, 2439645, 1
-          tz.transition 1967, 9, :o1, 58554347, 24
-          tz.transition 1974, 6, :o2, 141264000
-          tz.transition 1974, 8, :o1, 147222000
-          tz.transition 1976, 5, :o2, 199756800
-          tz.transition 1976, 7, :o1, 207702000
-          tz.transition 1977, 5, :o2, 231292800
-          tz.transition 1977, 9, :o1, 244249200
-          tz.transition 1978, 6, :o2, 265507200
-          tz.transition 1978, 8, :o1, 271033200
-          tz.transition 1984, 3, :o3, 448243200
-          tz.transition 1985, 12, :o1, 504918000
-          tz.transition 2008, 6, :o2, 1212278400
-          tz.transition 2008, 8, :o1, 1220223600
-          tz.transition 2009, 6, :o2, 1243814400
-          tz.transition 2009, 8, :o1, 1250809200
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Harare.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Harare.rb
deleted file mode 100644
index 070c95ae0f..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Harare.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Harare
-        include TimezoneDefinition
-        
-        timezone 'Africa/Harare' do |tz|
-          tz.offset :o0, 7452, 0, :LMT
-          tz.offset :o1, 7200, 0, :CAT
-          
-          tz.transition 1903, 2, :o1, 1932939531, 800
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Johannesburg.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Johannesburg.rb
deleted file mode 100644
index f0af0d8e33..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Johannesburg.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Johannesburg
-        include TimezoneDefinition
-        
-        timezone 'Africa/Johannesburg' do |tz|
-          tz.offset :o0, 6720, 0, :LMT
-          tz.offset :o1, 5400, 0, :SAST
-          tz.offset :o2, 7200, 0, :SAST
-          tz.offset :o3, 7200, 3600, :SAST
-          
-          tz.transition 1892, 2, :o1, 108546139, 45
-          tz.transition 1903, 2, :o2, 38658791, 16
-          tz.transition 1942, 9, :o3, 4861245, 2
-          tz.transition 1943, 3, :o2, 58339307, 24
-          tz.transition 1943, 9, :o3, 4861973, 2
-          tz.transition 1944, 3, :o2, 58348043, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Monrovia.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Monrovia.rb
deleted file mode 100644
index 40e711fa44..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Monrovia.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Monrovia
-        include TimezoneDefinition
-        
-        timezone 'Africa/Monrovia' do |tz|
-          tz.offset :o0, -2588, 0, :LMT
-          tz.offset :o1, -2588, 0, :MMT
-          tz.offset :o2, -2670, 0, :LRT
-          tz.offset :o3, 0, 0, :GMT
-          
-          tz.transition 1882, 1, :o1, 52022445047, 21600
-          tz.transition 1919, 3, :o2, 52315600247, 21600
-          tz.transition 1972, 5, :o3, 73529070
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Nairobi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Nairobi.rb
deleted file mode 100644
index 7b0a2f43be..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Nairobi.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Africa
-      module Nairobi
-        include TimezoneDefinition
-        
-        timezone 'Africa/Nairobi' do |tz|
-          tz.offset :o0, 8836, 0, :LMT
-          tz.offset :o1, 10800, 0, :EAT
-          tz.offset :o2, 9000, 0, :BEAT
-          tz.offset :o3, 9885, 0, :BEAUT
-          
-          tz.transition 1928, 6, :o1, 52389253391, 21600
-          tz.transition 1929, 12, :o2, 19407819, 8
-          tz.transition 1939, 12, :o3, 116622211, 48
-          tz.transition 1959, 12, :o1, 14036742061, 5760
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
deleted file mode 100644
index 307f9546de..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
+++ /dev/null
@@ -1,84 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module Buenos_Aires
-          include TimezoneDefinition
-          
-          timezone 'America/Argentina/Buenos_Aires' do |tz|
-            tz.offset :o0, -14028, 0, :LMT
-            tz.offset :o1, -15408, 0, :CMT
-            tz.offset :o2, -14400, 0, :ART
-            tz.offset :o3, -14400, 3600, :ARST
-            tz.offset :o4, -10800, 0, :ART
-            tz.offset :o5, -10800, 3600, :ARST
-            
-            tz.transition 1894, 10, :o1, 17374555169, 7200
-            tz.transition 1920, 5, :o2, 1453467407, 600
-            tz.transition 1930, 12, :o3, 7278935, 3
-            tz.transition 1931, 4, :o2, 19411461, 8
-            tz.transition 1931, 10, :o3, 7279889, 3
-            tz.transition 1932, 3, :o2, 19414141, 8
-            tz.transition 1932, 11, :o3, 7281038, 3
-            tz.transition 1933, 3, :o2, 19417061, 8
-            tz.transition 1933, 11, :o3, 7282133, 3
-            tz.transition 1934, 3, :o2, 19419981, 8
-            tz.transition 1934, 11, :o3, 7283228, 3
-            tz.transition 1935, 3, :o2, 19422901, 8
-            tz.transition 1935, 11, :o3, 7284323, 3
-            tz.transition 1936, 3, :o2, 19425829, 8
-            tz.transition 1936, 11, :o3, 7285421, 3
-            tz.transition 1937, 3, :o2, 19428749, 8
-            tz.transition 1937, 11, :o3, 7286516, 3
-            tz.transition 1938, 3, :o2, 19431669, 8
-            tz.transition 1938, 11, :o3, 7287611, 3
-            tz.transition 1939, 3, :o2, 19434589, 8
-            tz.transition 1939, 11, :o3, 7288706, 3
-            tz.transition 1940, 3, :o2, 19437517, 8
-            tz.transition 1940, 7, :o3, 7289435, 3
-            tz.transition 1941, 6, :o2, 19441285, 8
-            tz.transition 1941, 10, :o3, 7290848, 3
-            tz.transition 1943, 8, :o2, 19447501, 8
-            tz.transition 1943, 10, :o3, 7293038, 3
-            tz.transition 1946, 3, :o2, 19455045, 8
-            tz.transition 1946, 10, :o3, 7296284, 3
-            tz.transition 1963, 10, :o2, 19506429, 8
-            tz.transition 1963, 12, :o3, 7315136, 3
-            tz.transition 1964, 3, :o2, 19507645, 8
-            tz.transition 1964, 10, :o3, 7316051, 3
-            tz.transition 1965, 3, :o2, 19510565, 8
-            tz.transition 1965, 10, :o3, 7317146, 3
-            tz.transition 1966, 3, :o2, 19513485, 8
-            tz.transition 1966, 10, :o3, 7318241, 3
-            tz.transition 1967, 4, :o2, 19516661, 8
-            tz.transition 1967, 10, :o3, 7319294, 3
-            tz.transition 1968, 4, :o2, 19519629, 8
-            tz.transition 1968, 10, :o3, 7320407, 3
-            tz.transition 1969, 4, :o2, 19522541, 8
-            tz.transition 1969, 10, :o4, 7321499, 3
-            tz.transition 1974, 1, :o5, 128142000
-            tz.transition 1974, 5, :o4, 136605600
-            tz.transition 1988, 12, :o5, 596948400
-            tz.transition 1989, 3, :o4, 605066400
-            tz.transition 1989, 10, :o5, 624423600
-            tz.transition 1990, 3, :o4, 636516000
-            tz.transition 1990, 10, :o5, 656478000
-            tz.transition 1991, 3, :o4, 667965600
-            tz.transition 1991, 10, :o5, 687927600
-            tz.transition 1992, 3, :o4, 699415200
-            tz.transition 1992, 10, :o5, 719377200
-            tz.transition 1993, 3, :o4, 731469600
-            tz.transition 1999, 10, :o3, 938919600
-            tz.transition 2000, 3, :o4, 952052400
-            tz.transition 2007, 12, :o5, 1198983600
-            tz.transition 2008, 3, :o4, 1205632800
-            tz.transition 2008, 10, :o5, 1224385200
-            tz.transition 2009, 3, :o4, 1237082400
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Argentina/San_Juan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Argentina/San_Juan.rb
deleted file mode 100644
index ba8be4705f..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Argentina/San_Juan.rb
+++ /dev/null
@@ -1,86 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Argentina
-        module San_Juan
-          include TimezoneDefinition
-          
-          timezone 'America/Argentina/San_Juan' do |tz|
-            tz.offset :o0, -16444, 0, :LMT
-            tz.offset :o1, -15408, 0, :CMT
-            tz.offset :o2, -14400, 0, :ART
-            tz.offset :o3, -14400, 3600, :ARST
-            tz.offset :o4, -10800, 0, :ART
-            tz.offset :o5, -10800, 3600, :ARST
-            tz.offset :o6, -14400, 0, :WART
-            
-            tz.transition 1894, 10, :o1, 52123666111, 21600
-            tz.transition 1920, 5, :o2, 1453467407, 600
-            tz.transition 1930, 12, :o3, 7278935, 3
-            tz.transition 1931, 4, :o2, 19411461, 8
-            tz.transition 1931, 10, :o3, 7279889, 3
-            tz.transition 1932, 3, :o2, 19414141, 8
-            tz.transition 1932, 11, :o3, 7281038, 3
-            tz.transition 1933, 3, :o2, 19417061, 8
-            tz.transition 1933, 11, :o3, 7282133, 3
-            tz.transition 1934, 3, :o2, 19419981, 8
-            tz.transition 1934, 11, :o3, 7283228, 3
-            tz.transition 1935, 3, :o2, 19422901, 8
-            tz.transition 1935, 11, :o3, 7284323, 3
-            tz.transition 1936, 3, :o2, 19425829, 8
-            tz.transition 1936, 11, :o3, 7285421, 3
-            tz.transition 1937, 3, :o2, 19428749, 8
-            tz.transition 1937, 11, :o3, 7286516, 3
-            tz.transition 1938, 3, :o2, 19431669, 8
-            tz.transition 1938, 11, :o3, 7287611, 3
-            tz.transition 1939, 3, :o2, 19434589, 8
-            tz.transition 1939, 11, :o3, 7288706, 3
-            tz.transition 1940, 3, :o2, 19437517, 8
-            tz.transition 1940, 7, :o3, 7289435, 3
-            tz.transition 1941, 6, :o2, 19441285, 8
-            tz.transition 1941, 10, :o3, 7290848, 3
-            tz.transition 1943, 8, :o2, 19447501, 8
-            tz.transition 1943, 10, :o3, 7293038, 3
-            tz.transition 1946, 3, :o2, 19455045, 8
-            tz.transition 1946, 10, :o3, 7296284, 3
-            tz.transition 1963, 10, :o2, 19506429, 8
-            tz.transition 1963, 12, :o3, 7315136, 3
-            tz.transition 1964, 3, :o2, 19507645, 8
-            tz.transition 1964, 10, :o3, 7316051, 3
-            tz.transition 1965, 3, :o2, 19510565, 8
-            tz.transition 1965, 10, :o3, 7317146, 3
-            tz.transition 1966, 3, :o2, 19513485, 8
-            tz.transition 1966, 10, :o3, 7318241, 3
-            tz.transition 1967, 4, :o2, 19516661, 8
-            tz.transition 1967, 10, :o3, 7319294, 3
-            tz.transition 1968, 4, :o2, 19519629, 8
-            tz.transition 1968, 10, :o3, 7320407, 3
-            tz.transition 1969, 4, :o2, 19522541, 8
-            tz.transition 1969, 10, :o4, 7321499, 3
-            tz.transition 1974, 1, :o5, 128142000
-            tz.transition 1974, 5, :o4, 136605600
-            tz.transition 1988, 12, :o5, 596948400
-            tz.transition 1989, 3, :o4, 605066400
-            tz.transition 1989, 10, :o5, 624423600
-            tz.transition 1990, 3, :o4, 636516000
-            tz.transition 1990, 10, :o5, 656478000
-            tz.transition 1991, 3, :o6, 667792800
-            tz.transition 1991, 5, :o4, 673588800
-            tz.transition 1991, 10, :o5, 687927600
-            tz.transition 1992, 3, :o4, 699415200
-            tz.transition 1992, 10, :o5, 719377200
-            tz.transition 1993, 3, :o4, 731469600
-            tz.transition 1999, 10, :o3, 938919600
-            tz.transition 2000, 3, :o4, 952052400
-            tz.transition 2004, 5, :o6, 1085972400
-            tz.transition 2004, 7, :o4, 1090728000
-            tz.transition 2007, 12, :o5, 1198983600
-            tz.transition 2008, 3, :o4, 1205632800
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Bogota.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Bogota.rb
deleted file mode 100644
index ef96435c6a..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Bogota.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Bogota
-        include TimezoneDefinition
-        
-        timezone 'America/Bogota' do |tz|
-          tz.offset :o0, -17780, 0, :LMT
-          tz.offset :o1, -17780, 0, :BMT
-          tz.offset :o2, -18000, 0, :COT
-          tz.offset :o3, -18000, 3600, :COST
-          
-          tz.transition 1884, 3, :o1, 10407954409, 4320
-          tz.transition 1914, 11, :o2, 10456385929, 4320
-          tz.transition 1992, 5, :o3, 704869200
-          tz.transition 1993, 4, :o2, 733896000
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Caracas.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Caracas.rb
deleted file mode 100644
index 27392a540a..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Caracas.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Caracas
-        include TimezoneDefinition
-        
-        timezone 'America/Caracas' do |tz|
-          tz.offset :o0, -16064, 0, :LMT
-          tz.offset :o1, -16060, 0, :CMT
-          tz.offset :o2, -16200, 0, :VET
-          tz.offset :o3, -14400, 0, :VET
-          
-          tz.transition 1890, 1, :o1, 1627673863, 675
-          tz.transition 1912, 2, :o2, 10452001043, 4320
-          tz.transition 1965, 1, :o3, 39020187, 16
-          tz.transition 2007, 12, :o2, 1197183600
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Chicago.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Chicago.rb
deleted file mode 100644
index 0996857cf0..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Chicago.rb
+++ /dev/null
@@ -1,283 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Chicago
-        include TimezoneDefinition
-        
-        timezone 'America/Chicago' do |tz|
-          tz.offset :o0, -21036, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          tz.offset :o3, -18000, 0, :EST
-          tz.offset :o4, -21600, 3600, :CWT
-          tz.offset :o5, -21600, 3600, :CPT
-          
-          tz.transition 1883, 11, :o1, 9636533, 4
-          tz.transition 1918, 3, :o2, 14530103, 6
-          tz.transition 1918, 10, :o1, 58125451, 24
-          tz.transition 1919, 3, :o2, 14532287, 6
-          tz.transition 1919, 10, :o1, 58134187, 24
-          tz.transition 1920, 6, :o2, 14534933, 6
-          tz.transition 1920, 10, :o1, 58143091, 24
-          tz.transition 1921, 3, :o2, 14536655, 6
-          tz.transition 1921, 10, :o1, 58151827, 24
-          tz.transition 1922, 4, :o2, 14539049, 6
-          tz.transition 1922, 9, :o1, 58159723, 24
-          tz.transition 1923, 4, :o2, 14541233, 6
-          tz.transition 1923, 9, :o1, 58168627, 24
-          tz.transition 1924, 4, :o2, 14543417, 6
-          tz.transition 1924, 9, :o1, 58177363, 24
-          tz.transition 1925, 4, :o2, 14545601, 6
-          tz.transition 1925, 9, :o1, 58186099, 24
-          tz.transition 1926, 4, :o2, 14547785, 6
-          tz.transition 1926, 9, :o1, 58194835, 24
-          tz.transition 1927, 4, :o2, 14549969, 6
-          tz.transition 1927, 9, :o1, 58203571, 24
-          tz.transition 1928, 4, :o2, 14552195, 6
-          tz.transition 1928, 9, :o1, 58212475, 24
-          tz.transition 1929, 4, :o2, 14554379, 6
-          tz.transition 1929, 9, :o1, 58221211, 24
-          tz.transition 1930, 4, :o2, 14556563, 6
-          tz.transition 1930, 9, :o1, 58229947, 24
-          tz.transition 1931, 4, :o2, 14558747, 6
-          tz.transition 1931, 9, :o1, 58238683, 24
-          tz.transition 1932, 4, :o2, 14560931, 6
-          tz.transition 1932, 9, :o1, 58247419, 24
-          tz.transition 1933, 4, :o2, 14563157, 6
-          tz.transition 1933, 9, :o1, 58256155, 24
-          tz.transition 1934, 4, :o2, 14565341, 6
-          tz.transition 1934, 9, :o1, 58265059, 24
-          tz.transition 1935, 4, :o2, 14567525, 6
-          tz.transition 1935, 9, :o1, 58273795, 24
-          tz.transition 1936, 3, :o3, 14569373, 6
-          tz.transition 1936, 11, :o1, 58283707, 24
-          tz.transition 1937, 4, :o2, 14571893, 6
-          tz.transition 1937, 9, :o1, 58291267, 24
-          tz.transition 1938, 4, :o2, 14574077, 6
-          tz.transition 1938, 9, :o1, 58300003, 24
-          tz.transition 1939, 4, :o2, 14576303, 6
-          tz.transition 1939, 9, :o1, 58308739, 24
-          tz.transition 1940, 4, :o2, 14578487, 6
-          tz.transition 1940, 9, :o1, 58317643, 24
-          tz.transition 1941, 4, :o2, 14580671, 6
-          tz.transition 1941, 9, :o1, 58326379, 24
-          tz.transition 1942, 2, :o4, 14582399, 6
-          tz.transition 1945, 8, :o5, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361491, 24
-          tz.transition 1946, 4, :o2, 14591633, 6
-          tz.transition 1946, 9, :o1, 58370227, 24
-          tz.transition 1947, 4, :o2, 14593817, 6
-          tz.transition 1947, 9, :o1, 58378963, 24
-          tz.transition 1948, 4, :o2, 14596001, 6
-          tz.transition 1948, 9, :o1, 58387699, 24
-          tz.transition 1949, 4, :o2, 14598185, 6
-          tz.transition 1949, 9, :o1, 58396435, 24
-          tz.transition 1950, 4, :o2, 14600411, 6
-          tz.transition 1950, 9, :o1, 58405171, 24
-          tz.transition 1951, 4, :o2, 14602595, 6
-          tz.transition 1951, 9, :o1, 58414075, 24
-          tz.transition 1952, 4, :o2, 14604779, 6
-          tz.transition 1952, 9, :o1, 58422811, 24
-          tz.transition 1953, 4, :o2, 14606963, 6
-          tz.transition 1953, 9, :o1, 58431547, 24
-          tz.transition 1954, 4, :o2, 14609147, 6
-          tz.transition 1954, 9, :o1, 58440283, 24
-          tz.transition 1955, 4, :o2, 14611331, 6
-          tz.transition 1955, 10, :o1, 58449859, 24
-          tz.transition 1956, 4, :o2, 14613557, 6
-          tz.transition 1956, 10, :o1, 58458595, 24
-          tz.transition 1957, 4, :o2, 14615741, 6
-          tz.transition 1957, 10, :o1, 58467331, 24
-          tz.transition 1958, 4, :o2, 14617925, 6
-          tz.transition 1958, 10, :o1, 58476067, 24
-          tz.transition 1959, 4, :o2, 14620109, 6
-          tz.transition 1959, 10, :o1, 58484803, 24
-          tz.transition 1960, 4, :o2, 14622293, 6
-          tz.transition 1960, 10, :o1, 58493707, 24
-          tz.transition 1961, 4, :o2, 14624519, 6
-          tz.transition 1961, 10, :o1, 58502443, 24
-          tz.transition 1962, 4, :o2, 14626703, 6
-          tz.transition 1962, 10, :o1, 58511179, 24
-          tz.transition 1963, 4, :o2, 14628887, 6
-          tz.transition 1963, 10, :o1, 58519915, 24
-          tz.transition 1964, 4, :o2, 14631071, 6
-          tz.transition 1964, 10, :o1, 58528651, 24
-          tz.transition 1965, 4, :o2, 14633255, 6
-          tz.transition 1965, 10, :o1, 58537555, 24
-          tz.transition 1966, 4, :o2, 14635439, 6
-          tz.transition 1966, 10, :o1, 58546291, 24
-          tz.transition 1967, 4, :o2, 14637665, 6
-          tz.transition 1967, 10, :o1, 58555027, 24
-          tz.transition 1968, 4, :o2, 14639849, 6
-          tz.transition 1968, 10, :o1, 58563763, 24
-          tz.transition 1969, 4, :o2, 14642033, 6
-          tz.transition 1969, 10, :o1, 58572499, 24
-          tz.transition 1970, 4, :o2, 9964800
-          tz.transition 1970, 10, :o1, 25686000
-          tz.transition 1971, 4, :o2, 41414400
-          tz.transition 1971, 10, :o1, 57740400
-          tz.transition 1972, 4, :o2, 73468800
-          tz.transition 1972, 10, :o1, 89190000
-          tz.transition 1973, 4, :o2, 104918400
-          tz.transition 1973, 10, :o1, 120639600
-          tz.transition 1974, 1, :o2, 126691200
-          tz.transition 1974, 10, :o1, 152089200
-          tz.transition 1975, 2, :o2, 162374400
-          tz.transition 1975, 10, :o1, 183538800
-          tz.transition 1976, 4, :o2, 199267200
-          tz.transition 1976, 10, :o1, 215593200
-          tz.transition 1977, 4, :o2, 230716800
-          tz.transition 1977, 10, :o1, 247042800
-          tz.transition 1978, 4, :o2, 262771200
-          tz.transition 1978, 10, :o1, 278492400
-          tz.transition 1979, 4, :o2, 294220800
-          tz.transition 1979, 10, :o1, 309942000
-          tz.transition 1980, 4, :o2, 325670400
-          tz.transition 1980, 10, :o1, 341391600
-          tz.transition 1981, 4, :o2, 357120000
-          tz.transition 1981, 10, :o1, 372841200
-          tz.transition 1982, 4, :o2, 388569600
-          tz.transition 1982, 10, :o1, 404895600
-          tz.transition 1983, 4, :o2, 420019200
-          tz.transition 1983, 10, :o1, 436345200
-          tz.transition 1984, 4, :o2, 452073600
-          tz.transition 1984, 10, :o1, 467794800
-          tz.transition 1985, 4, :o2, 483523200
-          tz.transition 1985, 10, :o1, 499244400
-          tz.transition 1986, 4, :o2, 514972800
-          tz.transition 1986, 10, :o1, 530694000
-          tz.transition 1987, 4, :o2, 544608000
-          tz.transition 1987, 10, :o1, 562143600
-          tz.transition 1988, 4, :o2, 576057600
-          tz.transition 1988, 10, :o1, 594198000
-          tz.transition 1989, 4, :o2, 607507200
-          tz.transition 1989, 10, :o1, 625647600
-          tz.transition 1990, 4, :o2, 638956800
-          tz.transition 1990, 10, :o1, 657097200
-          tz.transition 1991, 4, :o2, 671011200
-          tz.transition 1991, 10, :o1, 688546800
-          tz.transition 1992, 4, :o2, 702460800
-          tz.transition 1992, 10, :o1, 719996400
-          tz.transition 1993, 4, :o2, 733910400
-          tz.transition 1993, 10, :o1, 752050800
-          tz.transition 1994, 4, :o2, 765360000
-          tz.transition 1994, 10, :o1, 783500400
-          tz.transition 1995, 4, :o2, 796809600
-          tz.transition 1995, 10, :o1, 814950000
-          tz.transition 1996, 4, :o2, 828864000
-          tz.transition 1996, 10, :o1, 846399600
-          tz.transition 1997, 4, :o2, 860313600
-          tz.transition 1997, 10, :o1, 877849200
-          tz.transition 1998, 4, :o2, 891763200
-          tz.transition 1998, 10, :o1, 909298800
-          tz.transition 1999, 4, :o2, 923212800
-          tz.transition 1999, 10, :o1, 941353200
-          tz.transition 2000, 4, :o2, 954662400
-          tz.transition 2000, 10, :o1, 972802800
-          tz.transition 2001, 4, :o2, 986112000
-          tz.transition 2001, 10, :o1, 1004252400
-          tz.transition 2002, 4, :o2, 1018166400
-          tz.transition 2002, 10, :o1, 1035702000
-          tz.transition 2003, 4, :o2, 1049616000
-          tz.transition 2003, 10, :o1, 1067151600
-          tz.transition 2004, 4, :o2, 1081065600
-          tz.transition 2004, 10, :o1, 1099206000
-          tz.transition 2005, 4, :o2, 1112515200
-          tz.transition 2005, 10, :o1, 1130655600
-          tz.transition 2006, 4, :o2, 1143964800
-          tz.transition 2006, 10, :o1, 1162105200
-          tz.transition 2007, 3, :o2, 1173600000
-          tz.transition 2007, 11, :o1, 1194159600
-          tz.transition 2008, 3, :o2, 1205049600
-          tz.transition 2008, 11, :o1, 1225609200
-          tz.transition 2009, 3, :o2, 1236499200
-          tz.transition 2009, 11, :o1, 1257058800
-          tz.transition 2010, 3, :o2, 1268553600
-          tz.transition 2010, 11, :o1, 1289113200
-          tz.transition 2011, 3, :o2, 1300003200
-          tz.transition 2011, 11, :o1, 1320562800
-          tz.transition 2012, 3, :o2, 1331452800
-          tz.transition 2012, 11, :o1, 1352012400
-          tz.transition 2013, 3, :o2, 1362902400
-          tz.transition 2013, 11, :o1, 1383462000
-          tz.transition 2014, 3, :o2, 1394352000
-          tz.transition 2014, 11, :o1, 1414911600
-          tz.transition 2015, 3, :o2, 1425801600
-          tz.transition 2015, 11, :o1, 1446361200
-          tz.transition 2016, 3, :o2, 1457856000
-          tz.transition 2016, 11, :o1, 1478415600
-          tz.transition 2017, 3, :o2, 1489305600
-          tz.transition 2017, 11, :o1, 1509865200
-          tz.transition 2018, 3, :o2, 1520755200
-          tz.transition 2018, 11, :o1, 1541314800
-          tz.transition 2019, 3, :o2, 1552204800
-          tz.transition 2019, 11, :o1, 1572764400
-          tz.transition 2020, 3, :o2, 1583654400
-          tz.transition 2020, 11, :o1, 1604214000
-          tz.transition 2021, 3, :o2, 1615708800
-          tz.transition 2021, 11, :o1, 1636268400
-          tz.transition 2022, 3, :o2, 1647158400
-          tz.transition 2022, 11, :o1, 1667718000
-          tz.transition 2023, 3, :o2, 1678608000
-          tz.transition 2023, 11, :o1, 1699167600
-          tz.transition 2024, 3, :o2, 1710057600
-          tz.transition 2024, 11, :o1, 1730617200
-          tz.transition 2025, 3, :o2, 1741507200
-          tz.transition 2025, 11, :o1, 1762066800
-          tz.transition 2026, 3, :o2, 1772956800
-          tz.transition 2026, 11, :o1, 1793516400
-          tz.transition 2027, 3, :o2, 1805011200
-          tz.transition 2027, 11, :o1, 1825570800
-          tz.transition 2028, 3, :o2, 1836460800
-          tz.transition 2028, 11, :o1, 1857020400
-          tz.transition 2029, 3, :o2, 1867910400
-          tz.transition 2029, 11, :o1, 1888470000
-          tz.transition 2030, 3, :o2, 1899360000
-          tz.transition 2030, 11, :o1, 1919919600
-          tz.transition 2031, 3, :o2, 1930809600
-          tz.transition 2031, 11, :o1, 1951369200
-          tz.transition 2032, 3, :o2, 1962864000
-          tz.transition 2032, 11, :o1, 1983423600
-          tz.transition 2033, 3, :o2, 1994313600
-          tz.transition 2033, 11, :o1, 2014873200
-          tz.transition 2034, 3, :o2, 2025763200
-          tz.transition 2034, 11, :o1, 2046322800
-          tz.transition 2035, 3, :o2, 2057212800
-          tz.transition 2035, 11, :o1, 2077772400
-          tz.transition 2036, 3, :o2, 2088662400
-          tz.transition 2036, 11, :o1, 2109222000
-          tz.transition 2037, 3, :o2, 2120112000
-          tz.transition 2037, 11, :o1, 2140671600
-          tz.transition 2038, 3, :o2, 14792981, 6
-          tz.transition 2038, 11, :o1, 59177635, 24
-          tz.transition 2039, 3, :o2, 14795165, 6
-          tz.transition 2039, 11, :o1, 59186371, 24
-          tz.transition 2040, 3, :o2, 14797349, 6
-          tz.transition 2040, 11, :o1, 59195107, 24
-          tz.transition 2041, 3, :o2, 14799533, 6
-          tz.transition 2041, 11, :o1, 59203843, 24
-          tz.transition 2042, 3, :o2, 14801717, 6
-          tz.transition 2042, 11, :o1, 59212579, 24
-          tz.transition 2043, 3, :o2, 14803901, 6
-          tz.transition 2043, 11, :o1, 59221315, 24
-          tz.transition 2044, 3, :o2, 14806127, 6
-          tz.transition 2044, 11, :o1, 59230219, 24
-          tz.transition 2045, 3, :o2, 14808311, 6
-          tz.transition 2045, 11, :o1, 59238955, 24
-          tz.transition 2046, 3, :o2, 14810495, 6
-          tz.transition 2046, 11, :o1, 59247691, 24
-          tz.transition 2047, 3, :o2, 14812679, 6
-          tz.transition 2047, 11, :o1, 59256427, 24
-          tz.transition 2048, 3, :o2, 14814863, 6
-          tz.transition 2048, 11, :o1, 59265163, 24
-          tz.transition 2049, 3, :o2, 14817089, 6
-          tz.transition 2049, 11, :o1, 59274067, 24
-          tz.transition 2050, 3, :o2, 14819273, 6
-          tz.transition 2050, 11, :o1, 59282803, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Chihuahua.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Chihuahua.rb
deleted file mode 100644
index 1710b57c79..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Chihuahua.rb
+++ /dev/null
@@ -1,136 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Chihuahua
-        include TimezoneDefinition
-        
-        timezone 'America/Chihuahua' do |tz|
-          tz.offset :o0, -25460, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -21600, 0, :CST
-          tz.offset :o3, -21600, 3600, :CDT
-          tz.offset :o4, -25200, 3600, :MDT
-          
-          tz.transition 1922, 1, :o1, 58153339, 24
-          tz.transition 1927, 6, :o2, 9700171, 4
-          tz.transition 1930, 11, :o1, 9705183, 4
-          tz.transition 1931, 5, :o2, 9705855, 4
-          tz.transition 1931, 10, :o1, 9706463, 4
-          tz.transition 1932, 4, :o2, 58243171, 24
-          tz.transition 1996, 4, :o3, 828864000
-          tz.transition 1996, 10, :o2, 846399600
-          tz.transition 1997, 4, :o3, 860313600
-          tz.transition 1997, 10, :o2, 877849200
-          tz.transition 1998, 4, :o4, 891766800
-          tz.transition 1998, 10, :o1, 909302400
-          tz.transition 1999, 4, :o4, 923216400
-          tz.transition 1999, 10, :o1, 941356800
-          tz.transition 2000, 4, :o4, 954666000
-          tz.transition 2000, 10, :o1, 972806400
-          tz.transition 2001, 5, :o4, 989139600
-          tz.transition 2001, 9, :o1, 1001836800
-          tz.transition 2002, 4, :o4, 1018170000
-          tz.transition 2002, 10, :o1, 1035705600
-          tz.transition 2003, 4, :o4, 1049619600
-          tz.transition 2003, 10, :o1, 1067155200
-          tz.transition 2004, 4, :o4, 1081069200
-          tz.transition 2004, 10, :o1, 1099209600
-          tz.transition 2005, 4, :o4, 1112518800
-          tz.transition 2005, 10, :o1, 1130659200
-          tz.transition 2006, 4, :o4, 1143968400
-          tz.transition 2006, 10, :o1, 1162108800
-          tz.transition 2007, 4, :o4, 1175418000
-          tz.transition 2007, 10, :o1, 1193558400
-          tz.transition 2008, 4, :o4, 1207472400
-          tz.transition 2008, 10, :o1, 1225008000
-          tz.transition 2009, 4, :o4, 1238922000
-          tz.transition 2009, 10, :o1, 1256457600
-          tz.transition 2010, 4, :o4, 1270371600
-          tz.transition 2010, 10, :o1, 1288512000
-          tz.transition 2011, 4, :o4, 1301821200
-          tz.transition 2011, 10, :o1, 1319961600
-          tz.transition 2012, 4, :o4, 1333270800
-          tz.transition 2012, 10, :o1, 1351411200
-          tz.transition 2013, 4, :o4, 1365325200
-          tz.transition 2013, 10, :o1, 1382860800
-          tz.transition 2014, 4, :o4, 1396774800
-          tz.transition 2014, 10, :o1, 1414310400
-          tz.transition 2015, 4, :o4, 1428224400
-          tz.transition 2015, 10, :o1, 1445760000
-          tz.transition 2016, 4, :o4, 1459674000
-          tz.transition 2016, 10, :o1, 1477814400
-          tz.transition 2017, 4, :o4, 1491123600
-          tz.transition 2017, 10, :o1, 1509264000
-          tz.transition 2018, 4, :o4, 1522573200
-          tz.transition 2018, 10, :o1, 1540713600
-          tz.transition 2019, 4, :o4, 1554627600
-          tz.transition 2019, 10, :o1, 1572163200
-          tz.transition 2020, 4, :o4, 1586077200
-          tz.transition 2020, 10, :o1, 1603612800
-          tz.transition 2021, 4, :o4, 1617526800
-          tz.transition 2021, 10, :o1, 1635667200
-          tz.transition 2022, 4, :o4, 1648976400
-          tz.transition 2022, 10, :o1, 1667116800
-          tz.transition 2023, 4, :o4, 1680426000
-          tz.transition 2023, 10, :o1, 1698566400
-          tz.transition 2024, 4, :o4, 1712480400
-          tz.transition 2024, 10, :o1, 1730016000
-          tz.transition 2025, 4, :o4, 1743930000
-          tz.transition 2025, 10, :o1, 1761465600
-          tz.transition 2026, 4, :o4, 1775379600
-          tz.transition 2026, 10, :o1, 1792915200
-          tz.transition 2027, 4, :o4, 1806829200
-          tz.transition 2027, 10, :o1, 1824969600
-          tz.transition 2028, 4, :o4, 1838278800
-          tz.transition 2028, 10, :o1, 1856419200
-          tz.transition 2029, 4, :o4, 1869728400
-          tz.transition 2029, 10, :o1, 1887868800
-          tz.transition 2030, 4, :o4, 1901782800
-          tz.transition 2030, 10, :o1, 1919318400
-          tz.transition 2031, 4, :o4, 1933232400
-          tz.transition 2031, 10, :o1, 1950768000
-          tz.transition 2032, 4, :o4, 1964682000
-          tz.transition 2032, 10, :o1, 1982822400
-          tz.transition 2033, 4, :o4, 1996131600
-          tz.transition 2033, 10, :o1, 2014272000
-          tz.transition 2034, 4, :o4, 2027581200
-          tz.transition 2034, 10, :o1, 2045721600
-          tz.transition 2035, 4, :o4, 2059030800
-          tz.transition 2035, 10, :o1, 2077171200
-          tz.transition 2036, 4, :o4, 2091085200
-          tz.transition 2036, 10, :o1, 2108620800
-          tz.transition 2037, 4, :o4, 2122534800
-          tz.transition 2037, 10, :o1, 2140070400
-          tz.transition 2038, 4, :o4, 19724143, 8
-          tz.transition 2038, 10, :o1, 14794367, 6
-          tz.transition 2039, 4, :o4, 19727055, 8
-          tz.transition 2039, 10, :o1, 14796551, 6
-          tz.transition 2040, 4, :o4, 19729967, 8
-          tz.transition 2040, 10, :o1, 14798735, 6
-          tz.transition 2041, 4, :o4, 19732935, 8
-          tz.transition 2041, 10, :o1, 14800919, 6
-          tz.transition 2042, 4, :o4, 19735847, 8
-          tz.transition 2042, 10, :o1, 14803103, 6
-          tz.transition 2043, 4, :o4, 19738759, 8
-          tz.transition 2043, 10, :o1, 14805287, 6
-          tz.transition 2044, 4, :o4, 19741671, 8
-          tz.transition 2044, 10, :o1, 14807513, 6
-          tz.transition 2045, 4, :o4, 19744583, 8
-          tz.transition 2045, 10, :o1, 14809697, 6
-          tz.transition 2046, 4, :o4, 19747495, 8
-          tz.transition 2046, 10, :o1, 14811881, 6
-          tz.transition 2047, 4, :o4, 19750463, 8
-          tz.transition 2047, 10, :o1, 14814065, 6
-          tz.transition 2048, 4, :o4, 19753375, 8
-          tz.transition 2048, 10, :o1, 14816249, 6
-          tz.transition 2049, 4, :o4, 19756287, 8
-          tz.transition 2049, 10, :o1, 14818475, 6
-          tz.transition 2050, 4, :o4, 19759199, 8
-          tz.transition 2050, 10, :o1, 14820659, 6
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Denver.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Denver.rb
deleted file mode 100644
index 1c1efb5ff3..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Denver.rb
+++ /dev/null
@@ -1,204 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Denver
-        include TimezoneDefinition
-        
-        timezone 'America/Denver' do |tz|
-          tz.offset :o0, -25196, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -25200, 3600, :MDT
-          tz.offset :o3, -25200, 3600, :MWT
-          tz.offset :o4, -25200, 3600, :MPT
-          
-          tz.transition 1883, 11, :o1, 57819199, 24
-          tz.transition 1918, 3, :o2, 19373471, 8
-          tz.transition 1918, 10, :o1, 14531363, 6
-          tz.transition 1919, 3, :o2, 19376383, 8
-          tz.transition 1919, 10, :o1, 14533547, 6
-          tz.transition 1920, 3, :o2, 19379295, 8
-          tz.transition 1920, 10, :o1, 14535773, 6
-          tz.transition 1921, 3, :o2, 19382207, 8
-          tz.transition 1921, 5, :o1, 14536991, 6
-          tz.transition 1942, 2, :o3, 19443199, 8
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 14590373, 6
-          tz.transition 1965, 4, :o2, 19511007, 8
-          tz.transition 1965, 10, :o1, 14634389, 6
-          tz.transition 1966, 4, :o2, 19513919, 8
-          tz.transition 1966, 10, :o1, 14636573, 6
-          tz.transition 1967, 4, :o2, 19516887, 8
-          tz.transition 1967, 10, :o1, 14638757, 6
-          tz.transition 1968, 4, :o2, 19519799, 8
-          tz.transition 1968, 10, :o1, 14640941, 6
-          tz.transition 1969, 4, :o2, 19522711, 8
-          tz.transition 1969, 10, :o1, 14643125, 6
-          tz.transition 1970, 4, :o2, 9968400
-          tz.transition 1970, 10, :o1, 25689600
-          tz.transition 1971, 4, :o2, 41418000
-          tz.transition 1971, 10, :o1, 57744000
-          tz.transition 1972, 4, :o2, 73472400
-          tz.transition 1972, 10, :o1, 89193600
-          tz.transition 1973, 4, :o2, 104922000
-          tz.transition 1973, 10, :o1, 120643200
-          tz.transition 1974, 1, :o2, 126694800
-          tz.transition 1974, 10, :o1, 152092800
-          tz.transition 1975, 2, :o2, 162378000
-          tz.transition 1975, 10, :o1, 183542400
-          tz.transition 1976, 4, :o2, 199270800
-          tz.transition 1976, 10, :o1, 215596800
-          tz.transition 1977, 4, :o2, 230720400
-          tz.transition 1977, 10, :o1, 247046400
-          tz.transition 1978, 4, :o2, 262774800
-          tz.transition 1978, 10, :o1, 278496000
-          tz.transition 1979, 4, :o2, 294224400
-          tz.transition 1979, 10, :o1, 309945600
-          tz.transition 1980, 4, :o2, 325674000
-          tz.transition 1980, 10, :o1, 341395200
-          tz.transition 1981, 4, :o2, 357123600
-          tz.transition 1981, 10, :o1, 372844800
-          tz.transition 1982, 4, :o2, 388573200
-          tz.transition 1982, 10, :o1, 404899200
-          tz.transition 1983, 4, :o2, 420022800
-          tz.transition 1983, 10, :o1, 436348800
-          tz.transition 1984, 4, :o2, 452077200
-          tz.transition 1984, 10, :o1, 467798400
-          tz.transition 1985, 4, :o2, 483526800
-          tz.transition 1985, 10, :o1, 499248000
-          tz.transition 1986, 4, :o2, 514976400
-          tz.transition 1986, 10, :o1, 530697600
-          tz.transition 1987, 4, :o2, 544611600
-          tz.transition 1987, 10, :o1, 562147200
-          tz.transition 1988, 4, :o2, 576061200
-          tz.transition 1988, 10, :o1, 594201600
-          tz.transition 1989, 4, :o2, 607510800
-          tz.transition 1989, 10, :o1, 625651200
-          tz.transition 1990, 4, :o2, 638960400
-          tz.transition 1990, 10, :o1, 657100800
-          tz.transition 1991, 4, :o2, 671014800
-          tz.transition 1991, 10, :o1, 688550400
-          tz.transition 1992, 4, :o2, 702464400
-          tz.transition 1992, 10, :o1, 720000000
-          tz.transition 1993, 4, :o2, 733914000
-          tz.transition 1993, 10, :o1, 752054400
-          tz.transition 1994, 4, :o2, 765363600
-          tz.transition 1994, 10, :o1, 783504000
-          tz.transition 1995, 4, :o2, 796813200
-          tz.transition 1995, 10, :o1, 814953600
-          tz.transition 1996, 4, :o2, 828867600
-          tz.transition 1996, 10, :o1, 846403200
-          tz.transition 1997, 4, :o2, 860317200
-          tz.transition 1997, 10, :o1, 877852800
-          tz.transition 1998, 4, :o2, 891766800
-          tz.transition 1998, 10, :o1, 909302400
-          tz.transition 1999, 4, :o2, 923216400
-          tz.transition 1999, 10, :o1, 941356800
-          tz.transition 2000, 4, :o2, 954666000
-          tz.transition 2000, 10, :o1, 972806400
-          tz.transition 2001, 4, :o2, 986115600
-          tz.transition 2001, 10, :o1, 1004256000
-          tz.transition 2002, 4, :o2, 1018170000
-          tz.transition 2002, 10, :o1, 1035705600
-          tz.transition 2003, 4, :o2, 1049619600
-          tz.transition 2003, 10, :o1, 1067155200
-          tz.transition 2004, 4, :o2, 1081069200
-          tz.transition 2004, 10, :o1, 1099209600
-          tz.transition 2005, 4, :o2, 1112518800
-          tz.transition 2005, 10, :o1, 1130659200
-          tz.transition 2006, 4, :o2, 1143968400
-          tz.transition 2006, 10, :o1, 1162108800
-          tz.transition 2007, 3, :o2, 1173603600
-          tz.transition 2007, 11, :o1, 1194163200
-          tz.transition 2008, 3, :o2, 1205053200
-          tz.transition 2008, 11, :o1, 1225612800
-          tz.transition 2009, 3, :o2, 1236502800
-          tz.transition 2009, 11, :o1, 1257062400
-          tz.transition 2010, 3, :o2, 1268557200
-          tz.transition 2010, 11, :o1, 1289116800
-          tz.transition 2011, 3, :o2, 1300006800
-          tz.transition 2011, 11, :o1, 1320566400
-          tz.transition 2012, 3, :o2, 1331456400
-          tz.transition 2012, 11, :o1, 1352016000
-          tz.transition 2013, 3, :o2, 1362906000
-          tz.transition 2013, 11, :o1, 1383465600
-          tz.transition 2014, 3, :o2, 1394355600
-          tz.transition 2014, 11, :o1, 1414915200
-          tz.transition 2015, 3, :o2, 1425805200
-          tz.transition 2015, 11, :o1, 1446364800
-          tz.transition 2016, 3, :o2, 1457859600
-          tz.transition 2016, 11, :o1, 1478419200
-          tz.transition 2017, 3, :o2, 1489309200
-          tz.transition 2017, 11, :o1, 1509868800
-          tz.transition 2018, 3, :o2, 1520758800
-          tz.transition 2018, 11, :o1, 1541318400
-          tz.transition 2019, 3, :o2, 1552208400
-          tz.transition 2019, 11, :o1, 1572768000
-          tz.transition 2020, 3, :o2, 1583658000
-          tz.transition 2020, 11, :o1, 1604217600
-          tz.transition 2021, 3, :o2, 1615712400
-          tz.transition 2021, 11, :o1, 1636272000
-          tz.transition 2022, 3, :o2, 1647162000
-          tz.transition 2022, 11, :o1, 1667721600
-          tz.transition 2023, 3, :o2, 1678611600
-          tz.transition 2023, 11, :o1, 1699171200
-          tz.transition 2024, 3, :o2, 1710061200
-          tz.transition 2024, 11, :o1, 1730620800
-          tz.transition 2025, 3, :o2, 1741510800
-          tz.transition 2025, 11, :o1, 1762070400
-          tz.transition 2026, 3, :o2, 1772960400
-          tz.transition 2026, 11, :o1, 1793520000
-          tz.transition 2027, 3, :o2, 1805014800
-          tz.transition 2027, 11, :o1, 1825574400
-          tz.transition 2028, 3, :o2, 1836464400
-          tz.transition 2028, 11, :o1, 1857024000
-          tz.transition 2029, 3, :o2, 1867914000
-          tz.transition 2029, 11, :o1, 1888473600
-          tz.transition 2030, 3, :o2, 1899363600
-          tz.transition 2030, 11, :o1, 1919923200
-          tz.transition 2031, 3, :o2, 1930813200
-          tz.transition 2031, 11, :o1, 1951372800
-          tz.transition 2032, 3, :o2, 1962867600
-          tz.transition 2032, 11, :o1, 1983427200
-          tz.transition 2033, 3, :o2, 1994317200
-          tz.transition 2033, 11, :o1, 2014876800
-          tz.transition 2034, 3, :o2, 2025766800
-          tz.transition 2034, 11, :o1, 2046326400
-          tz.transition 2035, 3, :o2, 2057216400
-          tz.transition 2035, 11, :o1, 2077776000
-          tz.transition 2036, 3, :o2, 2088666000
-          tz.transition 2036, 11, :o1, 2109225600
-          tz.transition 2037, 3, :o2, 2120115600
-          tz.transition 2037, 11, :o1, 2140675200
-          tz.transition 2038, 3, :o2, 19723975, 8
-          tz.transition 2038, 11, :o1, 14794409, 6
-          tz.transition 2039, 3, :o2, 19726887, 8
-          tz.transition 2039, 11, :o1, 14796593, 6
-          tz.transition 2040, 3, :o2, 19729799, 8
-          tz.transition 2040, 11, :o1, 14798777, 6
-          tz.transition 2041, 3, :o2, 19732711, 8
-          tz.transition 2041, 11, :o1, 14800961, 6
-          tz.transition 2042, 3, :o2, 19735623, 8
-          tz.transition 2042, 11, :o1, 14803145, 6
-          tz.transition 2043, 3, :o2, 19738535, 8
-          tz.transition 2043, 11, :o1, 14805329, 6
-          tz.transition 2044, 3, :o2, 19741503, 8
-          tz.transition 2044, 11, :o1, 14807555, 6
-          tz.transition 2045, 3, :o2, 19744415, 8
-          tz.transition 2045, 11, :o1, 14809739, 6
-          tz.transition 2046, 3, :o2, 19747327, 8
-          tz.transition 2046, 11, :o1, 14811923, 6
-          tz.transition 2047, 3, :o2, 19750239, 8
-          tz.transition 2047, 11, :o1, 14814107, 6
-          tz.transition 2048, 3, :o2, 19753151, 8
-          tz.transition 2048, 11, :o1, 14816291, 6
-          tz.transition 2049, 3, :o2, 19756119, 8
-          tz.transition 2049, 11, :o1, 14818517, 6
-          tz.transition 2050, 3, :o2, 19759031, 8
-          tz.transition 2050, 11, :o1, 14820701, 6
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Godthab.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Godthab.rb
deleted file mode 100644
index 1e05518b0d..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Godthab.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Godthab
-        include TimezoneDefinition
-        
-        timezone 'America/Godthab' do |tz|
-          tz.offset :o0, -12416, 0, :LMT
-          tz.offset :o1, -10800, 0, :WGT
-          tz.offset :o2, -10800, 3600, :WGST
-          
-          tz.transition 1916, 7, :o1, 3268448069, 1350
-          tz.transition 1980, 4, :o2, 323845200
-          tz.transition 1980, 9, :o1, 338950800
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Guatemala.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Guatemala.rb
deleted file mode 100644
index a2bf73401c..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Guatemala.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Guatemala
-        include TimezoneDefinition
-        
-        timezone 'America/Guatemala' do |tz|
-          tz.offset :o0, -21724, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          
-          tz.transition 1918, 10, :o1, 52312429831, 21600
-          tz.transition 1973, 11, :o2, 123055200
-          tz.transition 1974, 2, :o1, 130914000
-          tz.transition 1983, 5, :o2, 422344800
-          tz.transition 1983, 9, :o1, 433054800
-          tz.transition 1991, 3, :o2, 669708000
-          tz.transition 1991, 9, :o1, 684219600
-          tz.transition 2006, 4, :o2, 1146376800
-          tz.transition 2006, 10, :o1, 1159678800
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Halifax.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Halifax.rb
deleted file mode 100644
index d25ae775b3..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Halifax.rb
+++ /dev/null
@@ -1,274 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Halifax
-        include TimezoneDefinition
-        
-        timezone 'America/Halifax' do |tz|
-          tz.offset :o0, -15264, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          tz.offset :o2, -14400, 3600, :ADT
-          tz.offset :o3, -14400, 3600, :AWT
-          tz.offset :o4, -14400, 3600, :APT
-          
-          tz.transition 1902, 6, :o1, 724774703, 300
-          tz.transition 1916, 4, :o2, 7262864, 3
-          tz.transition 1916, 10, :o1, 19369101, 8
-          tz.transition 1918, 4, :o2, 9686791, 4
-          tz.transition 1918, 10, :o1, 58125545, 24
-          tz.transition 1920, 5, :o2, 7267361, 3
-          tz.transition 1920, 8, :o1, 19380525, 8
-          tz.transition 1921, 5, :o2, 7268447, 3
-          tz.transition 1921, 9, :o1, 19383501, 8
-          tz.transition 1922, 4, :o2, 7269524, 3
-          tz.transition 1922, 9, :o1, 19386421, 8
-          tz.transition 1923, 5, :o2, 7270637, 3
-          tz.transition 1923, 9, :o1, 19389333, 8
-          tz.transition 1924, 5, :o2, 7271729, 3
-          tz.transition 1924, 9, :o1, 19392349, 8
-          tz.transition 1925, 5, :o2, 7272821, 3
-          tz.transition 1925, 9, :o1, 19395373, 8
-          tz.transition 1926, 5, :o2, 7273955, 3
-          tz.transition 1926, 9, :o1, 19398173, 8
-          tz.transition 1927, 5, :o2, 7275005, 3
-          tz.transition 1927, 9, :o1, 19401197, 8
-          tz.transition 1928, 5, :o2, 7276139, 3
-          tz.transition 1928, 9, :o1, 19403989, 8
-          tz.transition 1929, 5, :o2, 7277231, 3
-          tz.transition 1929, 9, :o1, 19406861, 8
-          tz.transition 1930, 5, :o2, 7278323, 3
-          tz.transition 1930, 9, :o1, 19409877, 8
-          tz.transition 1931, 5, :o2, 7279415, 3
-          tz.transition 1931, 9, :o1, 19412901, 8
-          tz.transition 1932, 5, :o2, 7280486, 3
-          tz.transition 1932, 9, :o1, 19415813, 8
-          tz.transition 1933, 4, :o2, 7281578, 3
-          tz.transition 1933, 10, :o1, 19418781, 8
-          tz.transition 1934, 5, :o2, 7282733, 3
-          tz.transition 1934, 9, :o1, 19421573, 8
-          tz.transition 1935, 6, :o2, 7283867, 3
-          tz.transition 1935, 9, :o1, 19424605, 8
-          tz.transition 1936, 6, :o2, 7284962, 3
-          tz.transition 1936, 9, :o1, 19427405, 8
-          tz.transition 1937, 5, :o2, 7285967, 3
-          tz.transition 1937, 9, :o1, 19430429, 8
-          tz.transition 1938, 5, :o2, 7287059, 3
-          tz.transition 1938, 9, :o1, 19433341, 8
-          tz.transition 1939, 5, :o2, 7288235, 3
-          tz.transition 1939, 9, :o1, 19436253, 8
-          tz.transition 1940, 5, :o2, 7289264, 3
-          tz.transition 1940, 9, :o1, 19439221, 8
-          tz.transition 1941, 5, :o2, 7290356, 3
-          tz.transition 1941, 9, :o1, 19442133, 8
-          tz.transition 1942, 2, :o3, 9721599, 4
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361489, 24
-          tz.transition 1946, 4, :o2, 9727755, 4
-          tz.transition 1946, 9, :o1, 58370225, 24
-          tz.transition 1947, 4, :o2, 9729211, 4
-          tz.transition 1947, 9, :o1, 58378961, 24
-          tz.transition 1948, 4, :o2, 9730667, 4
-          tz.transition 1948, 9, :o1, 58387697, 24
-          tz.transition 1949, 4, :o2, 9732123, 4
-          tz.transition 1949, 9, :o1, 58396433, 24
-          tz.transition 1951, 4, :o2, 9735063, 4
-          tz.transition 1951, 9, :o1, 58414073, 24
-          tz.transition 1952, 4, :o2, 9736519, 4
-          tz.transition 1952, 9, :o1, 58422809, 24
-          tz.transition 1953, 4, :o2, 9737975, 4
-          tz.transition 1953, 9, :o1, 58431545, 24
-          tz.transition 1954, 4, :o2, 9739431, 4
-          tz.transition 1954, 9, :o1, 58440281, 24
-          tz.transition 1956, 4, :o2, 9742371, 4
-          tz.transition 1956, 9, :o1, 58457921, 24
-          tz.transition 1957, 4, :o2, 9743827, 4
-          tz.transition 1957, 9, :o1, 58466657, 24
-          tz.transition 1958, 4, :o2, 9745283, 4
-          tz.transition 1958, 9, :o1, 58475393, 24
-          tz.transition 1959, 4, :o2, 9746739, 4
-          tz.transition 1959, 9, :o1, 58484129, 24
-          tz.transition 1962, 4, :o2, 9751135, 4
-          tz.transition 1962, 10, :o1, 58511177, 24
-          tz.transition 1963, 4, :o2, 9752591, 4
-          tz.transition 1963, 10, :o1, 58519913, 24
-          tz.transition 1964, 4, :o2, 9754047, 4
-          tz.transition 1964, 10, :o1, 58528649, 24
-          tz.transition 1965, 4, :o2, 9755503, 4
-          tz.transition 1965, 10, :o1, 58537553, 24
-          tz.transition 1966, 4, :o2, 9756959, 4
-          tz.transition 1966, 10, :o1, 58546289, 24
-          tz.transition 1967, 4, :o2, 9758443, 4
-          tz.transition 1967, 10, :o1, 58555025, 24
-          tz.transition 1968, 4, :o2, 9759899, 4
-          tz.transition 1968, 10, :o1, 58563761, 24
-          tz.transition 1969, 4, :o2, 9761355, 4
-          tz.transition 1969, 10, :o1, 58572497, 24
-          tz.transition 1970, 4, :o2, 9957600
-          tz.transition 1970, 10, :o1, 25678800
-          tz.transition 1971, 4, :o2, 41407200
-          tz.transition 1971, 10, :o1, 57733200
-          tz.transition 1972, 4, :o2, 73461600
-          tz.transition 1972, 10, :o1, 89182800
-          tz.transition 1973, 4, :o2, 104911200
-          tz.transition 1973, 10, :o1, 120632400
-          tz.transition 1974, 4, :o2, 136360800
-          tz.transition 1974, 10, :o1, 152082000
-          tz.transition 1975, 4, :o2, 167810400
-          tz.transition 1975, 10, :o1, 183531600
-          tz.transition 1976, 4, :o2, 199260000
-          tz.transition 1976, 10, :o1, 215586000
-          tz.transition 1977, 4, :o2, 230709600
-          tz.transition 1977, 10, :o1, 247035600
-          tz.transition 1978, 4, :o2, 262764000
-          tz.transition 1978, 10, :o1, 278485200
-          tz.transition 1979, 4, :o2, 294213600
-          tz.transition 1979, 10, :o1, 309934800
-          tz.transition 1980, 4, :o2, 325663200
-          tz.transition 1980, 10, :o1, 341384400
-          tz.transition 1981, 4, :o2, 357112800
-          tz.transition 1981, 10, :o1, 372834000
-          tz.transition 1982, 4, :o2, 388562400
-          tz.transition 1982, 10, :o1, 404888400
-          tz.transition 1983, 4, :o2, 420012000
-          tz.transition 1983, 10, :o1, 436338000
-          tz.transition 1984, 4, :o2, 452066400
-          tz.transition 1984, 10, :o1, 467787600
-          tz.transition 1985, 4, :o2, 483516000
-          tz.transition 1985, 10, :o1, 499237200
-          tz.transition 1986, 4, :o2, 514965600
-          tz.transition 1986, 10, :o1, 530686800
-          tz.transition 1987, 4, :o2, 544600800
-          tz.transition 1987, 10, :o1, 562136400
-          tz.transition 1988, 4, :o2, 576050400
-          tz.transition 1988, 10, :o1, 594190800
-          tz.transition 1989, 4, :o2, 607500000
-          tz.transition 1989, 10, :o1, 625640400
-          tz.transition 1990, 4, :o2, 638949600
-          tz.transition 1990, 10, :o1, 657090000
-          tz.transition 1991, 4, :o2, 671004000
-          tz.transition 1991, 10, :o1, 688539600
-          tz.transition 1992, 4, :o2, 702453600
-          tz.transition 1992, 10, :o1, 719989200
-          tz.transition 1993, 4, :o2, 733903200
-          tz.transition 1993, 10, :o1, 752043600
-          tz.transition 1994, 4, :o2, 765352800
-          tz.transition 1994, 10, :o1, 783493200
-          tz.transition 1995, 4, :o2, 796802400
-          tz.transition 1995, 10, :o1, 814942800
-          tz.transition 1996, 4, :o2, 828856800
-          tz.transition 1996, 10, :o1, 846392400
-          tz.transition 1997, 4, :o2, 860306400
-          tz.transition 1997, 10, :o1, 877842000
-          tz.transition 1998, 4, :o2, 891756000
-          tz.transition 1998, 10, :o1, 909291600
-          tz.transition 1999, 4, :o2, 923205600
-          tz.transition 1999, 10, :o1, 941346000
-          tz.transition 2000, 4, :o2, 954655200
-          tz.transition 2000, 10, :o1, 972795600
-          tz.transition 2001, 4, :o2, 986104800
-          tz.transition 2001, 10, :o1, 1004245200
-          tz.transition 2002, 4, :o2, 1018159200
-          tz.transition 2002, 10, :o1, 1035694800
-          tz.transition 2003, 4, :o2, 1049608800
-          tz.transition 2003, 10, :o1, 1067144400
-          tz.transition 2004, 4, :o2, 1081058400
-          tz.transition 2004, 10, :o1, 1099198800
-          tz.transition 2005, 4, :o2, 1112508000
-          tz.transition 2005, 10, :o1, 1130648400
-          tz.transition 2006, 4, :o2, 1143957600
-          tz.transition 2006, 10, :o1, 1162098000
-          tz.transition 2007, 3, :o2, 1173592800
-          tz.transition 2007, 11, :o1, 1194152400
-          tz.transition 2008, 3, :o2, 1205042400
-          tz.transition 2008, 11, :o1, 1225602000
-          tz.transition 2009, 3, :o2, 1236492000
-          tz.transition 2009, 11, :o1, 1257051600
-          tz.transition 2010, 3, :o2, 1268546400
-          tz.transition 2010, 11, :o1, 1289106000
-          tz.transition 2011, 3, :o2, 1299996000
-          tz.transition 2011, 11, :o1, 1320555600
-          tz.transition 2012, 3, :o2, 1331445600
-          tz.transition 2012, 11, :o1, 1352005200
-          tz.transition 2013, 3, :o2, 1362895200
-          tz.transition 2013, 11, :o1, 1383454800
-          tz.transition 2014, 3, :o2, 1394344800
-          tz.transition 2014, 11, :o1, 1414904400
-          tz.transition 2015, 3, :o2, 1425794400
-          tz.transition 2015, 11, :o1, 1446354000
-          tz.transition 2016, 3, :o2, 1457848800
-          tz.transition 2016, 11, :o1, 1478408400
-          tz.transition 2017, 3, :o2, 1489298400
-          tz.transition 2017, 11, :o1, 1509858000
-          tz.transition 2018, 3, :o2, 1520748000
-          tz.transition 2018, 11, :o1, 1541307600
-          tz.transition 2019, 3, :o2, 1552197600
-          tz.transition 2019, 11, :o1, 1572757200
-          tz.transition 2020, 3, :o2, 1583647200
-          tz.transition 2020, 11, :o1, 1604206800
-          tz.transition 2021, 3, :o2, 1615701600
-          tz.transition 2021, 11, :o1, 1636261200
-          tz.transition 2022, 3, :o2, 1647151200
-          tz.transition 2022, 11, :o1, 1667710800
-          tz.transition 2023, 3, :o2, 1678600800
-          tz.transition 2023, 11, :o1, 1699160400
-          tz.transition 2024, 3, :o2, 1710050400
-          tz.transition 2024, 11, :o1, 1730610000
-          tz.transition 2025, 3, :o2, 1741500000
-          tz.transition 2025, 11, :o1, 1762059600
-          tz.transition 2026, 3, :o2, 1772949600
-          tz.transition 2026, 11, :o1, 1793509200
-          tz.transition 2027, 3, :o2, 1805004000
-          tz.transition 2027, 11, :o1, 1825563600
-          tz.transition 2028, 3, :o2, 1836453600
-          tz.transition 2028, 11, :o1, 1857013200
-          tz.transition 2029, 3, :o2, 1867903200
-          tz.transition 2029, 11, :o1, 1888462800
-          tz.transition 2030, 3, :o2, 1899352800
-          tz.transition 2030, 11, :o1, 1919912400
-          tz.transition 2031, 3, :o2, 1930802400
-          tz.transition 2031, 11, :o1, 1951362000
-          tz.transition 2032, 3, :o2, 1962856800
-          tz.transition 2032, 11, :o1, 1983416400
-          tz.transition 2033, 3, :o2, 1994306400
-          tz.transition 2033, 11, :o1, 2014866000
-          tz.transition 2034, 3, :o2, 2025756000
-          tz.transition 2034, 11, :o1, 2046315600
-          tz.transition 2035, 3, :o2, 2057205600
-          tz.transition 2035, 11, :o1, 2077765200
-          tz.transition 2036, 3, :o2, 2088655200
-          tz.transition 2036, 11, :o1, 2109214800
-          tz.transition 2037, 3, :o2, 2120104800
-          tz.transition 2037, 11, :o1, 2140664400
-          tz.transition 2038, 3, :o2, 9861987, 4
-          tz.transition 2038, 11, :o1, 59177633, 24
-          tz.transition 2039, 3, :o2, 9863443, 4
-          tz.transition 2039, 11, :o1, 59186369, 24
-          tz.transition 2040, 3, :o2, 9864899, 4
-          tz.transition 2040, 11, :o1, 59195105, 24
-          tz.transition 2041, 3, :o2, 9866355, 4
-          tz.transition 2041, 11, :o1, 59203841, 24
-          tz.transition 2042, 3, :o2, 9867811, 4
-          tz.transition 2042, 11, :o1, 59212577, 24
-          tz.transition 2043, 3, :o2, 9869267, 4
-          tz.transition 2043, 11, :o1, 59221313, 24
-          tz.transition 2044, 3, :o2, 9870751, 4
-          tz.transition 2044, 11, :o1, 59230217, 24
-          tz.transition 2045, 3, :o2, 9872207, 4
-          tz.transition 2045, 11, :o1, 59238953, 24
-          tz.transition 2046, 3, :o2, 9873663, 4
-          tz.transition 2046, 11, :o1, 59247689, 24
-          tz.transition 2047, 3, :o2, 9875119, 4
-          tz.transition 2047, 11, :o1, 59256425, 24
-          tz.transition 2048, 3, :o2, 9876575, 4
-          tz.transition 2048, 11, :o1, 59265161, 24
-          tz.transition 2049, 3, :o2, 9878059, 4
-          tz.transition 2049, 11, :o1, 59274065, 24
-          tz.transition 2050, 3, :o2, 9879515, 4
-          tz.transition 2050, 11, :o1, 59282801, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb
deleted file mode 100644
index f1430f6c24..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb
+++ /dev/null
@@ -1,149 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Indiana
-        module Indianapolis
-          include TimezoneDefinition
-          
-          timezone 'America/Indiana/Indianapolis' do |tz|
-            tz.offset :o0, -20678, 0, :LMT
-            tz.offset :o1, -21600, 0, :CST
-            tz.offset :o2, -21600, 3600, :CDT
-            tz.offset :o3, -21600, 3600, :CWT
-            tz.offset :o4, -21600, 3600, :CPT
-            tz.offset :o5, -18000, 0, :EST
-            tz.offset :o6, -18000, 3600, :EDT
-            
-            tz.transition 1883, 11, :o1, 9636533, 4
-            tz.transition 1918, 3, :o2, 14530103, 6
-            tz.transition 1918, 10, :o1, 58125451, 24
-            tz.transition 1919, 3, :o2, 14532287, 6
-            tz.transition 1919, 10, :o1, 58134187, 24
-            tz.transition 1941, 6, :o2, 14581007, 6
-            tz.transition 1941, 9, :o1, 58326379, 24
-            tz.transition 1942, 2, :o3, 14582399, 6
-            tz.transition 1945, 8, :o4, 58360379, 24
-            tz.transition 1945, 9, :o1, 58361491, 24
-            tz.transition 1946, 4, :o2, 14591633, 6
-            tz.transition 1946, 9, :o1, 58370227, 24
-            tz.transition 1947, 4, :o2, 14593817, 6
-            tz.transition 1947, 9, :o1, 58378963, 24
-            tz.transition 1948, 4, :o2, 14596001, 6
-            tz.transition 1948, 9, :o1, 58387699, 24
-            tz.transition 1949, 4, :o2, 14598185, 6
-            tz.transition 1949, 9, :o1, 58396435, 24
-            tz.transition 1950, 4, :o2, 14600411, 6
-            tz.transition 1950, 9, :o1, 58405171, 24
-            tz.transition 1951, 4, :o2, 14602595, 6
-            tz.transition 1951, 9, :o1, 58414075, 24
-            tz.transition 1952, 4, :o2, 14604779, 6
-            tz.transition 1952, 9, :o1, 58422811, 24
-            tz.transition 1953, 4, :o2, 14606963, 6
-            tz.transition 1953, 9, :o1, 58431547, 24
-            tz.transition 1954, 4, :o2, 14609147, 6
-            tz.transition 1954, 9, :o1, 58440283, 24
-            tz.transition 1955, 4, :o5, 14611331, 6
-            tz.transition 1957, 9, :o1, 58466659, 24
-            tz.transition 1958, 4, :o5, 14617925, 6
-            tz.transition 1969, 4, :o6, 58568131, 24
-            tz.transition 1969, 10, :o5, 9762083, 4
-            tz.transition 1970, 4, :o6, 9961200
-            tz.transition 1970, 10, :o5, 25682400
-            tz.transition 2006, 4, :o6, 1143961200
-            tz.transition 2006, 10, :o5, 1162101600
-            tz.transition 2007, 3, :o6, 1173596400
-            tz.transition 2007, 11, :o5, 1194156000
-            tz.transition 2008, 3, :o6, 1205046000
-            tz.transition 2008, 11, :o5, 1225605600
-            tz.transition 2009, 3, :o6, 1236495600
-            tz.transition 2009, 11, :o5, 1257055200
-            tz.transition 2010, 3, :o6, 1268550000
-            tz.transition 2010, 11, :o5, 1289109600
-            tz.transition 2011, 3, :o6, 1299999600
-            tz.transition 2011, 11, :o5, 1320559200
-            tz.transition 2012, 3, :o6, 1331449200
-            tz.transition 2012, 11, :o5, 1352008800
-            tz.transition 2013, 3, :o6, 1362898800
-            tz.transition 2013, 11, :o5, 1383458400
-            tz.transition 2014, 3, :o6, 1394348400
-            tz.transition 2014, 11, :o5, 1414908000
-            tz.transition 2015, 3, :o6, 1425798000
-            tz.transition 2015, 11, :o5, 1446357600
-            tz.transition 2016, 3, :o6, 1457852400
-            tz.transition 2016, 11, :o5, 1478412000
-            tz.transition 2017, 3, :o6, 1489302000
-            tz.transition 2017, 11, :o5, 1509861600
-            tz.transition 2018, 3, :o6, 1520751600
-            tz.transition 2018, 11, :o5, 1541311200
-            tz.transition 2019, 3, :o6, 1552201200
-            tz.transition 2019, 11, :o5, 1572760800
-            tz.transition 2020, 3, :o6, 1583650800
-            tz.transition 2020, 11, :o5, 1604210400
-            tz.transition 2021, 3, :o6, 1615705200
-            tz.transition 2021, 11, :o5, 1636264800
-            tz.transition 2022, 3, :o6, 1647154800
-            tz.transition 2022, 11, :o5, 1667714400
-            tz.transition 2023, 3, :o6, 1678604400
-            tz.transition 2023, 11, :o5, 1699164000
-            tz.transition 2024, 3, :o6, 1710054000
-            tz.transition 2024, 11, :o5, 1730613600
-            tz.transition 2025, 3, :o6, 1741503600
-            tz.transition 2025, 11, :o5, 1762063200
-            tz.transition 2026, 3, :o6, 1772953200
-            tz.transition 2026, 11, :o5, 1793512800
-            tz.transition 2027, 3, :o6, 1805007600
-            tz.transition 2027, 11, :o5, 1825567200
-            tz.transition 2028, 3, :o6, 1836457200
-            tz.transition 2028, 11, :o5, 1857016800
-            tz.transition 2029, 3, :o6, 1867906800
-            tz.transition 2029, 11, :o5, 1888466400
-            tz.transition 2030, 3, :o6, 1899356400
-            tz.transition 2030, 11, :o5, 1919916000
-            tz.transition 2031, 3, :o6, 1930806000
-            tz.transition 2031, 11, :o5, 1951365600
-            tz.transition 2032, 3, :o6, 1962860400
-            tz.transition 2032, 11, :o5, 1983420000
-            tz.transition 2033, 3, :o6, 1994310000
-            tz.transition 2033, 11, :o5, 2014869600
-            tz.transition 2034, 3, :o6, 2025759600
-            tz.transition 2034, 11, :o5, 2046319200
-            tz.transition 2035, 3, :o6, 2057209200
-            tz.transition 2035, 11, :o5, 2077768800
-            tz.transition 2036, 3, :o6, 2088658800
-            tz.transition 2036, 11, :o5, 2109218400
-            tz.transition 2037, 3, :o6, 2120108400
-            tz.transition 2037, 11, :o5, 2140668000
-            tz.transition 2038, 3, :o6, 59171923, 24
-            tz.transition 2038, 11, :o5, 9862939, 4
-            tz.transition 2039, 3, :o6, 59180659, 24
-            tz.transition 2039, 11, :o5, 9864395, 4
-            tz.transition 2040, 3, :o6, 59189395, 24
-            tz.transition 2040, 11, :o5, 9865851, 4
-            tz.transition 2041, 3, :o6, 59198131, 24
-            tz.transition 2041, 11, :o5, 9867307, 4
-            tz.transition 2042, 3, :o6, 59206867, 24
-            tz.transition 2042, 11, :o5, 9868763, 4
-            tz.transition 2043, 3, :o6, 59215603, 24
-            tz.transition 2043, 11, :o5, 9870219, 4
-            tz.transition 2044, 3, :o6, 59224507, 24
-            tz.transition 2044, 11, :o5, 9871703, 4
-            tz.transition 2045, 3, :o6, 59233243, 24
-            tz.transition 2045, 11, :o5, 9873159, 4
-            tz.transition 2046, 3, :o6, 59241979, 24
-            tz.transition 2046, 11, :o5, 9874615, 4
-            tz.transition 2047, 3, :o6, 59250715, 24
-            tz.transition 2047, 11, :o5, 9876071, 4
-            tz.transition 2048, 3, :o6, 59259451, 24
-            tz.transition 2048, 11, :o5, 9877527, 4
-            tz.transition 2049, 3, :o6, 59268355, 24
-            tz.transition 2049, 11, :o5, 9879011, 4
-            tz.transition 2050, 3, :o6, 59277091, 24
-            tz.transition 2050, 11, :o5, 9880467, 4
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Juneau.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Juneau.rb
deleted file mode 100644
index f646f3f54a..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Juneau.rb
+++ /dev/null
@@ -1,194 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Juneau
-        include TimezoneDefinition
-        
-        timezone 'America/Juneau' do |tz|
-          tz.offset :o0, 54139, 0, :LMT
-          tz.offset :o1, -32261, 0, :LMT
-          tz.offset :o2, -28800, 0, :PST
-          tz.offset :o3, -28800, 3600, :PWT
-          tz.offset :o4, -28800, 3600, :PPT
-          tz.offset :o5, -28800, 3600, :PDT
-          tz.offset :o6, -32400, 0, :YST
-          tz.offset :o7, -32400, 0, :AKST
-          tz.offset :o8, -32400, 3600, :AKDT
-          
-          tz.transition 1867, 10, :o1, 207641393861, 86400
-          tz.transition 1900, 8, :o2, 208677805061, 86400
-          tz.transition 1942, 2, :o3, 29164799, 12
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o2, 19453831, 8
-          tz.transition 1969, 4, :o5, 29284067, 12
-          tz.transition 1969, 10, :o2, 19524167, 8
-          tz.transition 1970, 4, :o5, 9972000
-          tz.transition 1970, 10, :o2, 25693200
-          tz.transition 1971, 4, :o5, 41421600
-          tz.transition 1971, 10, :o2, 57747600
-          tz.transition 1972, 4, :o5, 73476000
-          tz.transition 1972, 10, :o2, 89197200
-          tz.transition 1973, 4, :o5, 104925600
-          tz.transition 1973, 10, :o2, 120646800
-          tz.transition 1974, 1, :o5, 126698400
-          tz.transition 1974, 10, :o2, 152096400
-          tz.transition 1975, 2, :o5, 162381600
-          tz.transition 1975, 10, :o2, 183546000
-          tz.transition 1976, 4, :o5, 199274400
-          tz.transition 1976, 10, :o2, 215600400
-          tz.transition 1977, 4, :o5, 230724000
-          tz.transition 1977, 10, :o2, 247050000
-          tz.transition 1978, 4, :o5, 262778400
-          tz.transition 1978, 10, :o2, 278499600
-          tz.transition 1979, 4, :o5, 294228000
-          tz.transition 1979, 10, :o2, 309949200
-          tz.transition 1980, 4, :o5, 325677600
-          tz.transition 1980, 10, :o2, 341398800
-          tz.transition 1981, 4, :o5, 357127200
-          tz.transition 1981, 10, :o2, 372848400
-          tz.transition 1982, 4, :o5, 388576800
-          tz.transition 1982, 10, :o2, 404902800
-          tz.transition 1983, 4, :o5, 420026400
-          tz.transition 1983, 10, :o6, 436352400
-          tz.transition 1983, 11, :o7, 439030800
-          tz.transition 1984, 4, :o8, 452084400
-          tz.transition 1984, 10, :o7, 467805600
-          tz.transition 1985, 4, :o8, 483534000
-          tz.transition 1985, 10, :o7, 499255200
-          tz.transition 1986, 4, :o8, 514983600
-          tz.transition 1986, 10, :o7, 530704800
-          tz.transition 1987, 4, :o8, 544618800
-          tz.transition 1987, 10, :o7, 562154400
-          tz.transition 1988, 4, :o8, 576068400
-          tz.transition 1988, 10, :o7, 594208800
-          tz.transition 1989, 4, :o8, 607518000
-          tz.transition 1989, 10, :o7, 625658400
-          tz.transition 1990, 4, :o8, 638967600
-          tz.transition 1990, 10, :o7, 657108000
-          tz.transition 1991, 4, :o8, 671022000
-          tz.transition 1991, 10, :o7, 688557600
-          tz.transition 1992, 4, :o8, 702471600
-          tz.transition 1992, 10, :o7, 720007200
-          tz.transition 1993, 4, :o8, 733921200
-          tz.transition 1993, 10, :o7, 752061600
-          tz.transition 1994, 4, :o8, 765370800
-          tz.transition 1994, 10, :o7, 783511200
-          tz.transition 1995, 4, :o8, 796820400
-          tz.transition 1995, 10, :o7, 814960800
-          tz.transition 1996, 4, :o8, 828874800
-          tz.transition 1996, 10, :o7, 846410400
-          tz.transition 1997, 4, :o8, 860324400
-          tz.transition 1997, 10, :o7, 877860000
-          tz.transition 1998, 4, :o8, 891774000
-          tz.transition 1998, 10, :o7, 909309600
-          tz.transition 1999, 4, :o8, 923223600
-          tz.transition 1999, 10, :o7, 941364000
-          tz.transition 2000, 4, :o8, 954673200
-          tz.transition 2000, 10, :o7, 972813600
-          tz.transition 2001, 4, :o8, 986122800
-          tz.transition 2001, 10, :o7, 1004263200
-          tz.transition 2002, 4, :o8, 1018177200
-          tz.transition 2002, 10, :o7, 1035712800
-          tz.transition 2003, 4, :o8, 1049626800
-          tz.transition 2003, 10, :o7, 1067162400
-          tz.transition 2004, 4, :o8, 1081076400
-          tz.transition 2004, 10, :o7, 1099216800
-          tz.transition 2005, 4, :o8, 1112526000
-          tz.transition 2005, 10, :o7, 1130666400
-          tz.transition 2006, 4, :o8, 1143975600
-          tz.transition 2006, 10, :o7, 1162116000
-          tz.transition 2007, 3, :o8, 1173610800
-          tz.transition 2007, 11, :o7, 1194170400
-          tz.transition 2008, 3, :o8, 1205060400
-          tz.transition 2008, 11, :o7, 1225620000
-          tz.transition 2009, 3, :o8, 1236510000
-          tz.transition 2009, 11, :o7, 1257069600
-          tz.transition 2010, 3, :o8, 1268564400
-          tz.transition 2010, 11, :o7, 1289124000
-          tz.transition 2011, 3, :o8, 1300014000
-          tz.transition 2011, 11, :o7, 1320573600
-          tz.transition 2012, 3, :o8, 1331463600
-          tz.transition 2012, 11, :o7, 1352023200
-          tz.transition 2013, 3, :o8, 1362913200
-          tz.transition 2013, 11, :o7, 1383472800
-          tz.transition 2014, 3, :o8, 1394362800
-          tz.transition 2014, 11, :o7, 1414922400
-          tz.transition 2015, 3, :o8, 1425812400
-          tz.transition 2015, 11, :o7, 1446372000
-          tz.transition 2016, 3, :o8, 1457866800
-          tz.transition 2016, 11, :o7, 1478426400
-          tz.transition 2017, 3, :o8, 1489316400
-          tz.transition 2017, 11, :o7, 1509876000
-          tz.transition 2018, 3, :o8, 1520766000
-          tz.transition 2018, 11, :o7, 1541325600
-          tz.transition 2019, 3, :o8, 1552215600
-          tz.transition 2019, 11, :o7, 1572775200
-          tz.transition 2020, 3, :o8, 1583665200
-          tz.transition 2020, 11, :o7, 1604224800
-          tz.transition 2021, 3, :o8, 1615719600
-          tz.transition 2021, 11, :o7, 1636279200
-          tz.transition 2022, 3, :o8, 1647169200
-          tz.transition 2022, 11, :o7, 1667728800
-          tz.transition 2023, 3, :o8, 1678618800
-          tz.transition 2023, 11, :o7, 1699178400
-          tz.transition 2024, 3, :o8, 1710068400
-          tz.transition 2024, 11, :o7, 1730628000
-          tz.transition 2025, 3, :o8, 1741518000
-          tz.transition 2025, 11, :o7, 1762077600
-          tz.transition 2026, 3, :o8, 1772967600
-          tz.transition 2026, 11, :o7, 1793527200
-          tz.transition 2027, 3, :o8, 1805022000
-          tz.transition 2027, 11, :o7, 1825581600
-          tz.transition 2028, 3, :o8, 1836471600
-          tz.transition 2028, 11, :o7, 1857031200
-          tz.transition 2029, 3, :o8, 1867921200
-          tz.transition 2029, 11, :o7, 1888480800
-          tz.transition 2030, 3, :o8, 1899370800
-          tz.transition 2030, 11, :o7, 1919930400
-          tz.transition 2031, 3, :o8, 1930820400
-          tz.transition 2031, 11, :o7, 1951380000
-          tz.transition 2032, 3, :o8, 1962874800
-          tz.transition 2032, 11, :o7, 1983434400
-          tz.transition 2033, 3, :o8, 1994324400
-          tz.transition 2033, 11, :o7, 2014884000
-          tz.transition 2034, 3, :o8, 2025774000
-          tz.transition 2034, 11, :o7, 2046333600
-          tz.transition 2035, 3, :o8, 2057223600
-          tz.transition 2035, 11, :o7, 2077783200
-          tz.transition 2036, 3, :o8, 2088673200
-          tz.transition 2036, 11, :o7, 2109232800
-          tz.transition 2037, 3, :o8, 2120122800
-          tz.transition 2037, 11, :o7, 2140682400
-          tz.transition 2038, 3, :o8, 59171927, 24
-          tz.transition 2038, 11, :o7, 29588819, 12
-          tz.transition 2039, 3, :o8, 59180663, 24
-          tz.transition 2039, 11, :o7, 29593187, 12
-          tz.transition 2040, 3, :o8, 59189399, 24
-          tz.transition 2040, 11, :o7, 29597555, 12
-          tz.transition 2041, 3, :o8, 59198135, 24
-          tz.transition 2041, 11, :o7, 29601923, 12
-          tz.transition 2042, 3, :o8, 59206871, 24
-          tz.transition 2042, 11, :o7, 29606291, 12
-          tz.transition 2043, 3, :o8, 59215607, 24
-          tz.transition 2043, 11, :o7, 29610659, 12
-          tz.transition 2044, 3, :o8, 59224511, 24
-          tz.transition 2044, 11, :o7, 29615111, 12
-          tz.transition 2045, 3, :o8, 59233247, 24
-          tz.transition 2045, 11, :o7, 29619479, 12
-          tz.transition 2046, 3, :o8, 59241983, 24
-          tz.transition 2046, 11, :o7, 29623847, 12
-          tz.transition 2047, 3, :o8, 59250719, 24
-          tz.transition 2047, 11, :o7, 29628215, 12
-          tz.transition 2048, 3, :o8, 59259455, 24
-          tz.transition 2048, 11, :o7, 29632583, 12
-          tz.transition 2049, 3, :o8, 59268359, 24
-          tz.transition 2049, 11, :o7, 29637035, 12
-          tz.transition 2050, 3, :o8, 59277095, 24
-          tz.transition 2050, 11, :o7, 29641403, 12
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/La_Paz.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/La_Paz.rb
deleted file mode 100644
index 45c907899f..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/La_Paz.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module La_Paz
-        include TimezoneDefinition
-        
-        timezone 'America/La_Paz' do |tz|
-          tz.offset :o0, -16356, 0, :LMT
-          tz.offset :o1, -16356, 0, :CMT
-          tz.offset :o2, -16356, 3600, :BOST
-          tz.offset :o3, -14400, 0, :BOT
-          
-          tz.transition 1890, 1, :o1, 17361854563, 7200
-          tz.transition 1931, 10, :o2, 17471733763, 7200
-          tz.transition 1932, 3, :o3, 17472871063, 7200
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Lima.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Lima.rb
deleted file mode 100644
index af68ac29f7..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Lima.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Lima
-        include TimezoneDefinition
-        
-        timezone 'America/Lima' do |tz|
-          tz.offset :o0, -18492, 0, :LMT
-          tz.offset :o1, -18516, 0, :LMT
-          tz.offset :o2, -18000, 0, :PET
-          tz.offset :o3, -18000, 3600, :PEST
-          
-          tz.transition 1890, 1, :o1, 17361854741, 7200
-          tz.transition 1908, 7, :o2, 17410685143, 7200
-          tz.transition 1938, 1, :o3, 58293593, 24
-          tz.transition 1938, 4, :o2, 7286969, 3
-          tz.transition 1938, 9, :o3, 58300001, 24
-          tz.transition 1939, 3, :o2, 7288046, 3
-          tz.transition 1939, 9, :o3, 58308737, 24
-          tz.transition 1940, 3, :o2, 7289138, 3
-          tz.transition 1986, 1, :o3, 504939600
-          tz.transition 1986, 4, :o2, 512712000
-          tz.transition 1987, 1, :o3, 536475600
-          tz.transition 1987, 4, :o2, 544248000
-          tz.transition 1990, 1, :o3, 631170000
-          tz.transition 1990, 4, :o2, 638942400
-          tz.transition 1994, 1, :o3, 757400400
-          tz.transition 1994, 4, :o2, 765172800
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Los_Angeles.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Los_Angeles.rb
deleted file mode 100644
index 16007fd675..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Los_Angeles.rb
+++ /dev/null
@@ -1,232 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Los_Angeles
-        include TimezoneDefinition
-        
-        timezone 'America/Los_Angeles' do |tz|
-          tz.offset :o0, -28378, 0, :LMT
-          tz.offset :o1, -28800, 0, :PST
-          tz.offset :o2, -28800, 3600, :PDT
-          tz.offset :o3, -28800, 3600, :PWT
-          tz.offset :o4, -28800, 3600, :PPT
-          
-          tz.transition 1883, 11, :o1, 7227400, 3
-          tz.transition 1918, 3, :o2, 29060207, 12
-          tz.transition 1918, 10, :o1, 19375151, 8
-          tz.transition 1919, 3, :o2, 29064575, 12
-          tz.transition 1919, 10, :o1, 19378063, 8
-          tz.transition 1942, 2, :o3, 29164799, 12
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 19453831, 8
-          tz.transition 1948, 3, :o2, 29191499, 12
-          tz.transition 1949, 1, :o1, 19463343, 8
-          tz.transition 1950, 4, :o2, 29200823, 12
-          tz.transition 1950, 9, :o1, 19468391, 8
-          tz.transition 1951, 4, :o2, 29205191, 12
-          tz.transition 1951, 9, :o1, 19471359, 8
-          tz.transition 1952, 4, :o2, 29209559, 12
-          tz.transition 1952, 9, :o1, 19474271, 8
-          tz.transition 1953, 4, :o2, 29213927, 12
-          tz.transition 1953, 9, :o1, 19477183, 8
-          tz.transition 1954, 4, :o2, 29218295, 12
-          tz.transition 1954, 9, :o1, 19480095, 8
-          tz.transition 1955, 4, :o2, 29222663, 12
-          tz.transition 1955, 9, :o1, 19483007, 8
-          tz.transition 1956, 4, :o2, 29227115, 12
-          tz.transition 1956, 9, :o1, 19485975, 8
-          tz.transition 1957, 4, :o2, 29231483, 12
-          tz.transition 1957, 9, :o1, 19488887, 8
-          tz.transition 1958, 4, :o2, 29235851, 12
-          tz.transition 1958, 9, :o1, 19491799, 8
-          tz.transition 1959, 4, :o2, 29240219, 12
-          tz.transition 1959, 9, :o1, 19494711, 8
-          tz.transition 1960, 4, :o2, 29244587, 12
-          tz.transition 1960, 9, :o1, 19497623, 8
-          tz.transition 1961, 4, :o2, 29249039, 12
-          tz.transition 1961, 9, :o1, 19500535, 8
-          tz.transition 1962, 4, :o2, 29253407, 12
-          tz.transition 1962, 10, :o1, 19503727, 8
-          tz.transition 1963, 4, :o2, 29257775, 12
-          tz.transition 1963, 10, :o1, 19506639, 8
-          tz.transition 1964, 4, :o2, 29262143, 12
-          tz.transition 1964, 10, :o1, 19509551, 8
-          tz.transition 1965, 4, :o2, 29266511, 12
-          tz.transition 1965, 10, :o1, 19512519, 8
-          tz.transition 1966, 4, :o2, 29270879, 12
-          tz.transition 1966, 10, :o1, 19515431, 8
-          tz.transition 1967, 4, :o2, 29275331, 12
-          tz.transition 1967, 10, :o1, 19518343, 8
-          tz.transition 1968, 4, :o2, 29279699, 12
-          tz.transition 1968, 10, :o1, 19521255, 8
-          tz.transition 1969, 4, :o2, 29284067, 12
-          tz.transition 1969, 10, :o1, 19524167, 8
-          tz.transition 1970, 4, :o2, 9972000
-          tz.transition 1970, 10, :o1, 25693200
-          tz.transition 1971, 4, :o2, 41421600
-          tz.transition 1971, 10, :o1, 57747600
-          tz.transition 1972, 4, :o2, 73476000
-          tz.transition 1972, 10, :o1, 89197200
-          tz.transition 1973, 4, :o2, 104925600
-          tz.transition 1973, 10, :o1, 120646800
-          tz.transition 1974, 1, :o2, 126698400
-          tz.transition 1974, 10, :o1, 152096400
-          tz.transition 1975, 2, :o2, 162381600
-          tz.transition 1975, 10, :o1, 183546000
-          tz.transition 1976, 4, :o2, 199274400
-          tz.transition 1976, 10, :o1, 215600400
-          tz.transition 1977, 4, :o2, 230724000
-          tz.transition 1977, 10, :o1, 247050000
-          tz.transition 1978, 4, :o2, 262778400
-          tz.transition 1978, 10, :o1, 278499600
-          tz.transition 1979, 4, :o2, 294228000
-          tz.transition 1979, 10, :o1, 309949200
-          tz.transition 1980, 4, :o2, 325677600
-          tz.transition 1980, 10, :o1, 341398800
-          tz.transition 1981, 4, :o2, 357127200
-          tz.transition 1981, 10, :o1, 372848400
-          tz.transition 1982, 4, :o2, 388576800
-          tz.transition 1982, 10, :o1, 404902800
-          tz.transition 1983, 4, :o2, 420026400
-          tz.transition 1983, 10, :o1, 436352400
-          tz.transition 1984, 4, :o2, 452080800
-          tz.transition 1984, 10, :o1, 467802000
-          tz.transition 1985, 4, :o2, 483530400
-          tz.transition 1985, 10, :o1, 499251600
-          tz.transition 1986, 4, :o2, 514980000
-          tz.transition 1986, 10, :o1, 530701200
-          tz.transition 1987, 4, :o2, 544615200
-          tz.transition 1987, 10, :o1, 562150800
-          tz.transition 1988, 4, :o2, 576064800
-          tz.transition 1988, 10, :o1, 594205200
-          tz.transition 1989, 4, :o2, 607514400
-          tz.transition 1989, 10, :o1, 625654800
-          tz.transition 1990, 4, :o2, 638964000
-          tz.transition 1990, 10, :o1, 657104400
-          tz.transition 1991, 4, :o2, 671018400
-          tz.transition 1991, 10, :o1, 688554000
-          tz.transition 1992, 4, :o2, 702468000
-          tz.transition 1992, 10, :o1, 720003600
-          tz.transition 1993, 4, :o2, 733917600
-          tz.transition 1993, 10, :o1, 752058000
-          tz.transition 1994, 4, :o2, 765367200
-          tz.transition 1994, 10, :o1, 783507600
-          tz.transition 1995, 4, :o2, 796816800
-          tz.transition 1995, 10, :o1, 814957200
-          tz.transition 1996, 4, :o2, 828871200
-          tz.transition 1996, 10, :o1, 846406800
-          tz.transition 1997, 4, :o2, 860320800
-          tz.transition 1997, 10, :o1, 877856400
-          tz.transition 1998, 4, :o2, 891770400
-          tz.transition 1998, 10, :o1, 909306000
-          tz.transition 1999, 4, :o2, 923220000
-          tz.transition 1999, 10, :o1, 941360400
-          tz.transition 2000, 4, :o2, 954669600
-          tz.transition 2000, 10, :o1, 972810000
-          tz.transition 2001, 4, :o2, 986119200
-          tz.transition 2001, 10, :o1, 1004259600
-          tz.transition 2002, 4, :o2, 1018173600
-          tz.transition 2002, 10, :o1, 1035709200
-          tz.transition 2003, 4, :o2, 1049623200
-          tz.transition 2003, 10, :o1, 1067158800
-          tz.transition 2004, 4, :o2, 1081072800
-          tz.transition 2004, 10, :o1, 1099213200
-          tz.transition 2005, 4, :o2, 1112522400
-          tz.transition 2005, 10, :o1, 1130662800
-          tz.transition 2006, 4, :o2, 1143972000
-          tz.transition 2006, 10, :o1, 1162112400
-          tz.transition 2007, 3, :o2, 1173607200
-          tz.transition 2007, 11, :o1, 1194166800
-          tz.transition 2008, 3, :o2, 1205056800
-          tz.transition 2008, 11, :o1, 1225616400
-          tz.transition 2009, 3, :o2, 1236506400
-          tz.transition 2009, 11, :o1, 1257066000
-          tz.transition 2010, 3, :o2, 1268560800
-          tz.transition 2010, 11, :o1, 1289120400
-          tz.transition 2011, 3, :o2, 1300010400
-          tz.transition 2011, 11, :o1, 1320570000
-          tz.transition 2012, 3, :o2, 1331460000
-          tz.transition 2012, 11, :o1, 1352019600
-          tz.transition 2013, 3, :o2, 1362909600
-          tz.transition 2013, 11, :o1, 1383469200
-          tz.transition 2014, 3, :o2, 1394359200
-          tz.transition 2014, 11, :o1, 1414918800
-          tz.transition 2015, 3, :o2, 1425808800
-          tz.transition 2015, 11, :o1, 1446368400
-          tz.transition 2016, 3, :o2, 1457863200
-          tz.transition 2016, 11, :o1, 1478422800
-          tz.transition 2017, 3, :o2, 1489312800
-          tz.transition 2017, 11, :o1, 1509872400
-          tz.transition 2018, 3, :o2, 1520762400
-          tz.transition 2018, 11, :o1, 1541322000
-          tz.transition 2019, 3, :o2, 1552212000
-          tz.transition 2019, 11, :o1, 1572771600
-          tz.transition 2020, 3, :o2, 1583661600
-          tz.transition 2020, 11, :o1, 1604221200
-          tz.transition 2021, 3, :o2, 1615716000
-          tz.transition 2021, 11, :o1, 1636275600
-          tz.transition 2022, 3, :o2, 1647165600
-          tz.transition 2022, 11, :o1, 1667725200
-          tz.transition 2023, 3, :o2, 1678615200
-          tz.transition 2023, 11, :o1, 1699174800
-          tz.transition 2024, 3, :o2, 1710064800
-          tz.transition 2024, 11, :o1, 1730624400
-          tz.transition 2025, 3, :o2, 1741514400
-          tz.transition 2025, 11, :o1, 1762074000
-          tz.transition 2026, 3, :o2, 1772964000
-          tz.transition 2026, 11, :o1, 1793523600
-          tz.transition 2027, 3, :o2, 1805018400
-          tz.transition 2027, 11, :o1, 1825578000
-          tz.transition 2028, 3, :o2, 1836468000
-          tz.transition 2028, 11, :o1, 1857027600
-          tz.transition 2029, 3, :o2, 1867917600
-          tz.transition 2029, 11, :o1, 1888477200
-          tz.transition 2030, 3, :o2, 1899367200
-          tz.transition 2030, 11, :o1, 1919926800
-          tz.transition 2031, 3, :o2, 1930816800
-          tz.transition 2031, 11, :o1, 1951376400
-          tz.transition 2032, 3, :o2, 1962871200
-          tz.transition 2032, 11, :o1, 1983430800
-          tz.transition 2033, 3, :o2, 1994320800
-          tz.transition 2033, 11, :o1, 2014880400
-          tz.transition 2034, 3, :o2, 2025770400
-          tz.transition 2034, 11, :o1, 2046330000
-          tz.transition 2035, 3, :o2, 2057220000
-          tz.transition 2035, 11, :o1, 2077779600
-          tz.transition 2036, 3, :o2, 2088669600
-          tz.transition 2036, 11, :o1, 2109229200
-          tz.transition 2037, 3, :o2, 2120119200
-          tz.transition 2037, 11, :o1, 2140678800
-          tz.transition 2038, 3, :o2, 29585963, 12
-          tz.transition 2038, 11, :o1, 19725879, 8
-          tz.transition 2039, 3, :o2, 29590331, 12
-          tz.transition 2039, 11, :o1, 19728791, 8
-          tz.transition 2040, 3, :o2, 29594699, 12
-          tz.transition 2040, 11, :o1, 19731703, 8
-          tz.transition 2041, 3, :o2, 29599067, 12
-          tz.transition 2041, 11, :o1, 19734615, 8
-          tz.transition 2042, 3, :o2, 29603435, 12
-          tz.transition 2042, 11, :o1, 19737527, 8
-          tz.transition 2043, 3, :o2, 29607803, 12
-          tz.transition 2043, 11, :o1, 19740439, 8
-          tz.transition 2044, 3, :o2, 29612255, 12
-          tz.transition 2044, 11, :o1, 19743407, 8
-          tz.transition 2045, 3, :o2, 29616623, 12
-          tz.transition 2045, 11, :o1, 19746319, 8
-          tz.transition 2046, 3, :o2, 29620991, 12
-          tz.transition 2046, 11, :o1, 19749231, 8
-          tz.transition 2047, 3, :o2, 29625359, 12
-          tz.transition 2047, 11, :o1, 19752143, 8
-          tz.transition 2048, 3, :o2, 29629727, 12
-          tz.transition 2048, 11, :o1, 19755055, 8
-          tz.transition 2049, 3, :o2, 29634179, 12
-          tz.transition 2049, 11, :o1, 19758023, 8
-          tz.transition 2050, 3, :o2, 29638547, 12
-          tz.transition 2050, 11, :o1, 19760935, 8
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Mazatlan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Mazatlan.rb
deleted file mode 100644
index ba9e6efcf1..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Mazatlan.rb
+++ /dev/null
@@ -1,139 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Mazatlan
-        include TimezoneDefinition
-        
-        timezone 'America/Mazatlan' do |tz|
-          tz.offset :o0, -25540, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -21600, 0, :CST
-          tz.offset :o3, -28800, 0, :PST
-          tz.offset :o4, -25200, 3600, :MDT
-          
-          tz.transition 1922, 1, :o1, 58153339, 24
-          tz.transition 1927, 6, :o2, 9700171, 4
-          tz.transition 1930, 11, :o1, 9705183, 4
-          tz.transition 1931, 5, :o2, 9705855, 4
-          tz.transition 1931, 10, :o1, 9706463, 4
-          tz.transition 1932, 4, :o2, 58243171, 24
-          tz.transition 1942, 4, :o1, 9721895, 4
-          tz.transition 1949, 1, :o3, 58390339, 24
-          tz.transition 1970, 1, :o1, 28800
-          tz.transition 1996, 4, :o4, 828867600
-          tz.transition 1996, 10, :o1, 846403200
-          tz.transition 1997, 4, :o4, 860317200
-          tz.transition 1997, 10, :o1, 877852800
-          tz.transition 1998, 4, :o4, 891766800
-          tz.transition 1998, 10, :o1, 909302400
-          tz.transition 1999, 4, :o4, 923216400
-          tz.transition 1999, 10, :o1, 941356800
-          tz.transition 2000, 4, :o4, 954666000
-          tz.transition 2000, 10, :o1, 972806400
-          tz.transition 2001, 5, :o4, 989139600
-          tz.transition 2001, 9, :o1, 1001836800
-          tz.transition 2002, 4, :o4, 1018170000
-          tz.transition 2002, 10, :o1, 1035705600
-          tz.transition 2003, 4, :o4, 1049619600
-          tz.transition 2003, 10, :o1, 1067155200
-          tz.transition 2004, 4, :o4, 1081069200
-          tz.transition 2004, 10, :o1, 1099209600
-          tz.transition 2005, 4, :o4, 1112518800
-          tz.transition 2005, 10, :o1, 1130659200
-          tz.transition 2006, 4, :o4, 1143968400
-          tz.transition 2006, 10, :o1, 1162108800
-          tz.transition 2007, 4, :o4, 1175418000
-          tz.transition 2007, 10, :o1, 1193558400
-          tz.transition 2008, 4, :o4, 1207472400
-          tz.transition 2008, 10, :o1, 1225008000
-          tz.transition 2009, 4, :o4, 1238922000
-          tz.transition 2009, 10, :o1, 1256457600
-          tz.transition 2010, 4, :o4, 1270371600
-          tz.transition 2010, 10, :o1, 1288512000
-          tz.transition 2011, 4, :o4, 1301821200
-          tz.transition 2011, 10, :o1, 1319961600
-          tz.transition 2012, 4, :o4, 1333270800
-          tz.transition 2012, 10, :o1, 1351411200
-          tz.transition 2013, 4, :o4, 1365325200
-          tz.transition 2013, 10, :o1, 1382860800
-          tz.transition 2014, 4, :o4, 1396774800
-          tz.transition 2014, 10, :o1, 1414310400
-          tz.transition 2015, 4, :o4, 1428224400
-          tz.transition 2015, 10, :o1, 1445760000
-          tz.transition 2016, 4, :o4, 1459674000
-          tz.transition 2016, 10, :o1, 1477814400
-          tz.transition 2017, 4, :o4, 1491123600
-          tz.transition 2017, 10, :o1, 1509264000
-          tz.transition 2018, 4, :o4, 1522573200
-          tz.transition 2018, 10, :o1, 1540713600
-          tz.transition 2019, 4, :o4, 1554627600
-          tz.transition 2019, 10, :o1, 1572163200
-          tz.transition 2020, 4, :o4, 1586077200
-          tz.transition 2020, 10, :o1, 1603612800
-          tz.transition 2021, 4, :o4, 1617526800
-          tz.transition 2021, 10, :o1, 1635667200
-          tz.transition 2022, 4, :o4, 1648976400
-          tz.transition 2022, 10, :o1, 1667116800
-          tz.transition 2023, 4, :o4, 1680426000
-          tz.transition 2023, 10, :o1, 1698566400
-          tz.transition 2024, 4, :o4, 1712480400
-          tz.transition 2024, 10, :o1, 1730016000
-          tz.transition 2025, 4, :o4, 1743930000
-          tz.transition 2025, 10, :o1, 1761465600
-          tz.transition 2026, 4, :o4, 1775379600
-          tz.transition 2026, 10, :o1, 1792915200
-          tz.transition 2027, 4, :o4, 1806829200
-          tz.transition 2027, 10, :o1, 1824969600
-          tz.transition 2028, 4, :o4, 1838278800
-          tz.transition 2028, 10, :o1, 1856419200
-          tz.transition 2029, 4, :o4, 1869728400
-          tz.transition 2029, 10, :o1, 1887868800
-          tz.transition 2030, 4, :o4, 1901782800
-          tz.transition 2030, 10, :o1, 1919318400
-          tz.transition 2031, 4, :o4, 1933232400
-          tz.transition 2031, 10, :o1, 1950768000
-          tz.transition 2032, 4, :o4, 1964682000
-          tz.transition 2032, 10, :o1, 1982822400
-          tz.transition 2033, 4, :o4, 1996131600
-          tz.transition 2033, 10, :o1, 2014272000
-          tz.transition 2034, 4, :o4, 2027581200
-          tz.transition 2034, 10, :o1, 2045721600
-          tz.transition 2035, 4, :o4, 2059030800
-          tz.transition 2035, 10, :o1, 2077171200
-          tz.transition 2036, 4, :o4, 2091085200
-          tz.transition 2036, 10, :o1, 2108620800
-          tz.transition 2037, 4, :o4, 2122534800
-          tz.transition 2037, 10, :o1, 2140070400
-          tz.transition 2038, 4, :o4, 19724143, 8
-          tz.transition 2038, 10, :o1, 14794367, 6
-          tz.transition 2039, 4, :o4, 19727055, 8
-          tz.transition 2039, 10, :o1, 14796551, 6
-          tz.transition 2040, 4, :o4, 19729967, 8
-          tz.transition 2040, 10, :o1, 14798735, 6
-          tz.transition 2041, 4, :o4, 19732935, 8
-          tz.transition 2041, 10, :o1, 14800919, 6
-          tz.transition 2042, 4, :o4, 19735847, 8
-          tz.transition 2042, 10, :o1, 14803103, 6
-          tz.transition 2043, 4, :o4, 19738759, 8
-          tz.transition 2043, 10, :o1, 14805287, 6
-          tz.transition 2044, 4, :o4, 19741671, 8
-          tz.transition 2044, 10, :o1, 14807513, 6
-          tz.transition 2045, 4, :o4, 19744583, 8
-          tz.transition 2045, 10, :o1, 14809697, 6
-          tz.transition 2046, 4, :o4, 19747495, 8
-          tz.transition 2046, 10, :o1, 14811881, 6
-          tz.transition 2047, 4, :o4, 19750463, 8
-          tz.transition 2047, 10, :o1, 14814065, 6
-          tz.transition 2048, 4, :o4, 19753375, 8
-          tz.transition 2048, 10, :o1, 14816249, 6
-          tz.transition 2049, 4, :o4, 19756287, 8
-          tz.transition 2049, 10, :o1, 14818475, 6
-          tz.transition 2050, 4, :o4, 19759199, 8
-          tz.transition 2050, 10, :o1, 14820659, 6
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Mexico_City.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Mexico_City.rb
deleted file mode 100644
index 2347fce647..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Mexico_City.rb
+++ /dev/null
@@ -1,144 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Mexico_City
-        include TimezoneDefinition
-        
-        timezone 'America/Mexico_City' do |tz|
-          tz.offset :o0, -23796, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -21600, 0, :CST
-          tz.offset :o3, -21600, 3600, :CDT
-          tz.offset :o4, -21600, 3600, :CWT
-          
-          tz.transition 1922, 1, :o1, 58153339, 24
-          tz.transition 1927, 6, :o2, 9700171, 4
-          tz.transition 1930, 11, :o1, 9705183, 4
-          tz.transition 1931, 5, :o2, 9705855, 4
-          tz.transition 1931, 10, :o1, 9706463, 4
-          tz.transition 1932, 4, :o2, 58243171, 24
-          tz.transition 1939, 2, :o3, 9717199, 4
-          tz.transition 1939, 6, :o2, 58306553, 24
-          tz.transition 1940, 12, :o3, 9719891, 4
-          tz.transition 1941, 4, :o2, 58322057, 24
-          tz.transition 1943, 12, :o4, 9724299, 4
-          tz.transition 1944, 5, :o2, 58349081, 24
-          tz.transition 1950, 2, :o3, 9733299, 4
-          tz.transition 1950, 7, :o2, 58403825, 24
-          tz.transition 1996, 4, :o3, 828864000
-          tz.transition 1996, 10, :o2, 846399600
-          tz.transition 1997, 4, :o3, 860313600
-          tz.transition 1997, 10, :o2, 877849200
-          tz.transition 1998, 4, :o3, 891763200
-          tz.transition 1998, 10, :o2, 909298800
-          tz.transition 1999, 4, :o3, 923212800
-          tz.transition 1999, 10, :o2, 941353200
-          tz.transition 2000, 4, :o3, 954662400
-          tz.transition 2000, 10, :o2, 972802800
-          tz.transition 2001, 5, :o3, 989136000
-          tz.transition 2001, 9, :o2, 1001833200
-          tz.transition 2002, 4, :o3, 1018166400
-          tz.transition 2002, 10, :o2, 1035702000
-          tz.transition 2003, 4, :o3, 1049616000
-          tz.transition 2003, 10, :o2, 1067151600
-          tz.transition 2004, 4, :o3, 1081065600
-          tz.transition 2004, 10, :o2, 1099206000
-          tz.transition 2005, 4, :o3, 1112515200
-          tz.transition 2005, 10, :o2, 1130655600
-          tz.transition 2006, 4, :o3, 1143964800
-          tz.transition 2006, 10, :o2, 1162105200
-          tz.transition 2007, 4, :o3, 1175414400
-          tz.transition 2007, 10, :o2, 1193554800
-          tz.transition 2008, 4, :o3, 1207468800
-          tz.transition 2008, 10, :o2, 1225004400
-          tz.transition 2009, 4, :o3, 1238918400
-          tz.transition 2009, 10, :o2, 1256454000
-          tz.transition 2010, 4, :o3, 1270368000
-          tz.transition 2010, 10, :o2, 1288508400
-          tz.transition 2011, 4, :o3, 1301817600
-          tz.transition 2011, 10, :o2, 1319958000
-          tz.transition 2012, 4, :o3, 1333267200
-          tz.transition 2012, 10, :o2, 1351407600
-          tz.transition 2013, 4, :o3, 1365321600
-          tz.transition 2013, 10, :o2, 1382857200
-          tz.transition 2014, 4, :o3, 1396771200
-          tz.transition 2014, 10, :o2, 1414306800
-          tz.transition 2015, 4, :o3, 1428220800
-          tz.transition 2015, 10, :o2, 1445756400
-          tz.transition 2016, 4, :o3, 1459670400
-          tz.transition 2016, 10, :o2, 1477810800
-          tz.transition 2017, 4, :o3, 1491120000
-          tz.transition 2017, 10, :o2, 1509260400
-          tz.transition 2018, 4, :o3, 1522569600
-          tz.transition 2018, 10, :o2, 1540710000
-          tz.transition 2019, 4, :o3, 1554624000
-          tz.transition 2019, 10, :o2, 1572159600
-          tz.transition 2020, 4, :o3, 1586073600
-          tz.transition 2020, 10, :o2, 1603609200
-          tz.transition 2021, 4, :o3, 1617523200
-          tz.transition 2021, 10, :o2, 1635663600
-          tz.transition 2022, 4, :o3, 1648972800
-          tz.transition 2022, 10, :o2, 1667113200
-          tz.transition 2023, 4, :o3, 1680422400
-          tz.transition 2023, 10, :o2, 1698562800
-          tz.transition 2024, 4, :o3, 1712476800
-          tz.transition 2024, 10, :o2, 1730012400
-          tz.transition 2025, 4, :o3, 1743926400
-          tz.transition 2025, 10, :o2, 1761462000
-          tz.transition 2026, 4, :o3, 1775376000
-          tz.transition 2026, 10, :o2, 1792911600
-          tz.transition 2027, 4, :o3, 1806825600
-          tz.transition 2027, 10, :o2, 1824966000
-          tz.transition 2028, 4, :o3, 1838275200
-          tz.transition 2028, 10, :o2, 1856415600
-          tz.transition 2029, 4, :o3, 1869724800
-          tz.transition 2029, 10, :o2, 1887865200
-          tz.transition 2030, 4, :o3, 1901779200
-          tz.transition 2030, 10, :o2, 1919314800
-          tz.transition 2031, 4, :o3, 1933228800
-          tz.transition 2031, 10, :o2, 1950764400
-          tz.transition 2032, 4, :o3, 1964678400
-          tz.transition 2032, 10, :o2, 1982818800
-          tz.transition 2033, 4, :o3, 1996128000
-          tz.transition 2033, 10, :o2, 2014268400
-          tz.transition 2034, 4, :o3, 2027577600
-          tz.transition 2034, 10, :o2, 2045718000
-          tz.transition 2035, 4, :o3, 2059027200
-          tz.transition 2035, 10, :o2, 2077167600
-          tz.transition 2036, 4, :o3, 2091081600
-          tz.transition 2036, 10, :o2, 2108617200
-          tz.transition 2037, 4, :o3, 2122531200
-          tz.transition 2037, 10, :o2, 2140066800
-          tz.transition 2038, 4, :o3, 14793107, 6
-          tz.transition 2038, 10, :o2, 59177467, 24
-          tz.transition 2039, 4, :o3, 14795291, 6
-          tz.transition 2039, 10, :o2, 59186203, 24
-          tz.transition 2040, 4, :o3, 14797475, 6
-          tz.transition 2040, 10, :o2, 59194939, 24
-          tz.transition 2041, 4, :o3, 14799701, 6
-          tz.transition 2041, 10, :o2, 59203675, 24
-          tz.transition 2042, 4, :o3, 14801885, 6
-          tz.transition 2042, 10, :o2, 59212411, 24
-          tz.transition 2043, 4, :o3, 14804069, 6
-          tz.transition 2043, 10, :o2, 59221147, 24
-          tz.transition 2044, 4, :o3, 14806253, 6
-          tz.transition 2044, 10, :o2, 59230051, 24
-          tz.transition 2045, 4, :o3, 14808437, 6
-          tz.transition 2045, 10, :o2, 59238787, 24
-          tz.transition 2046, 4, :o3, 14810621, 6
-          tz.transition 2046, 10, :o2, 59247523, 24
-          tz.transition 2047, 4, :o3, 14812847, 6
-          tz.transition 2047, 10, :o2, 59256259, 24
-          tz.transition 2048, 4, :o3, 14815031, 6
-          tz.transition 2048, 10, :o2, 59264995, 24
-          tz.transition 2049, 4, :o3, 14817215, 6
-          tz.transition 2049, 10, :o2, 59273899, 24
-          tz.transition 2050, 4, :o3, 14819399, 6
-          tz.transition 2050, 10, :o2, 59282635, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Monterrey.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Monterrey.rb
deleted file mode 100644
index 5816a9eab1..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Monterrey.rb
+++ /dev/null
@@ -1,131 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Monterrey
-        include TimezoneDefinition
-        
-        timezone 'America/Monterrey' do |tz|
-          tz.offset :o0, -24076, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          
-          tz.transition 1922, 1, :o1, 9692223, 4
-          tz.transition 1988, 4, :o2, 576057600
-          tz.transition 1988, 10, :o1, 594198000
-          tz.transition 1996, 4, :o2, 828864000
-          tz.transition 1996, 10, :o1, 846399600
-          tz.transition 1997, 4, :o2, 860313600
-          tz.transition 1997, 10, :o1, 877849200
-          tz.transition 1998, 4, :o2, 891763200
-          tz.transition 1998, 10, :o1, 909298800
-          tz.transition 1999, 4, :o2, 923212800
-          tz.transition 1999, 10, :o1, 941353200
-          tz.transition 2000, 4, :o2, 954662400
-          tz.transition 2000, 10, :o1, 972802800
-          tz.transition 2001, 5, :o2, 989136000
-          tz.transition 2001, 9, :o1, 1001833200
-          tz.transition 2002, 4, :o2, 1018166400
-          tz.transition 2002, 10, :o1, 1035702000
-          tz.transition 2003, 4, :o2, 1049616000
-          tz.transition 2003, 10, :o1, 1067151600
-          tz.transition 2004, 4, :o2, 1081065600
-          tz.transition 2004, 10, :o1, 1099206000
-          tz.transition 2005, 4, :o2, 1112515200
-          tz.transition 2005, 10, :o1, 1130655600
-          tz.transition 2006, 4, :o2, 1143964800
-          tz.transition 2006, 10, :o1, 1162105200
-          tz.transition 2007, 4, :o2, 1175414400
-          tz.transition 2007, 10, :o1, 1193554800
-          tz.transition 2008, 4, :o2, 1207468800
-          tz.transition 2008, 10, :o1, 1225004400
-          tz.transition 2009, 4, :o2, 1238918400
-          tz.transition 2009, 10, :o1, 1256454000
-          tz.transition 2010, 4, :o2, 1270368000
-          tz.transition 2010, 10, :o1, 1288508400
-          tz.transition 2011, 4, :o2, 1301817600
-          tz.transition 2011, 10, :o1, 1319958000
-          tz.transition 2012, 4, :o2, 1333267200
-          tz.transition 2012, 10, :o1, 1351407600
-          tz.transition 2013, 4, :o2, 1365321600
-          tz.transition 2013, 10, :o1, 1382857200
-          tz.transition 2014, 4, :o2, 1396771200
-          tz.transition 2014, 10, :o1, 1414306800
-          tz.transition 2015, 4, :o2, 1428220800
-          tz.transition 2015, 10, :o1, 1445756400
-          tz.transition 2016, 4, :o2, 1459670400
-          tz.transition 2016, 10, :o1, 1477810800
-          tz.transition 2017, 4, :o2, 1491120000
-          tz.transition 2017, 10, :o1, 1509260400
-          tz.transition 2018, 4, :o2, 1522569600
-          tz.transition 2018, 10, :o1, 1540710000
-          tz.transition 2019, 4, :o2, 1554624000
-          tz.transition 2019, 10, :o1, 1572159600
-          tz.transition 2020, 4, :o2, 1586073600
-          tz.transition 2020, 10, :o1, 1603609200
-          tz.transition 2021, 4, :o2, 1617523200
-          tz.transition 2021, 10, :o1, 1635663600
-          tz.transition 2022, 4, :o2, 1648972800
-          tz.transition 2022, 10, :o1, 1667113200
-          tz.transition 2023, 4, :o2, 1680422400
-          tz.transition 2023, 10, :o1, 1698562800
-          tz.transition 2024, 4, :o2, 1712476800
-          tz.transition 2024, 10, :o1, 1730012400
-          tz.transition 2025, 4, :o2, 1743926400
-          tz.transition 2025, 10, :o1, 1761462000
-          tz.transition 2026, 4, :o2, 1775376000
-          tz.transition 2026, 10, :o1, 1792911600
-          tz.transition 2027, 4, :o2, 1806825600
-          tz.transition 2027, 10, :o1, 1824966000
-          tz.transition 2028, 4, :o2, 1838275200
-          tz.transition 2028, 10, :o1, 1856415600
-          tz.transition 2029, 4, :o2, 1869724800
-          tz.transition 2029, 10, :o1, 1887865200
-          tz.transition 2030, 4, :o2, 1901779200
-          tz.transition 2030, 10, :o1, 1919314800
-          tz.transition 2031, 4, :o2, 1933228800
-          tz.transition 2031, 10, :o1, 1950764400
-          tz.transition 2032, 4, :o2, 1964678400
-          tz.transition 2032, 10, :o1, 1982818800
-          tz.transition 2033, 4, :o2, 1996128000
-          tz.transition 2033, 10, :o1, 2014268400
-          tz.transition 2034, 4, :o2, 2027577600
-          tz.transition 2034, 10, :o1, 2045718000
-          tz.transition 2035, 4, :o2, 2059027200
-          tz.transition 2035, 10, :o1, 2077167600
-          tz.transition 2036, 4, :o2, 2091081600
-          tz.transition 2036, 10, :o1, 2108617200
-          tz.transition 2037, 4, :o2, 2122531200
-          tz.transition 2037, 10, :o1, 2140066800
-          tz.transition 2038, 4, :o2, 14793107, 6
-          tz.transition 2038, 10, :o1, 59177467, 24
-          tz.transition 2039, 4, :o2, 14795291, 6
-          tz.transition 2039, 10, :o1, 59186203, 24
-          tz.transition 2040, 4, :o2, 14797475, 6
-          tz.transition 2040, 10, :o1, 59194939, 24
-          tz.transition 2041, 4, :o2, 14799701, 6
-          tz.transition 2041, 10, :o1, 59203675, 24
-          tz.transition 2042, 4, :o2, 14801885, 6
-          tz.transition 2042, 10, :o1, 59212411, 24
-          tz.transition 2043, 4, :o2, 14804069, 6
-          tz.transition 2043, 10, :o1, 59221147, 24
-          tz.transition 2044, 4, :o2, 14806253, 6
-          tz.transition 2044, 10, :o1, 59230051, 24
-          tz.transition 2045, 4, :o2, 14808437, 6
-          tz.transition 2045, 10, :o1, 59238787, 24
-          tz.transition 2046, 4, :o2, 14810621, 6
-          tz.transition 2046, 10, :o1, 59247523, 24
-          tz.transition 2047, 4, :o2, 14812847, 6
-          tz.transition 2047, 10, :o1, 59256259, 24
-          tz.transition 2048, 4, :o2, 14815031, 6
-          tz.transition 2048, 10, :o1, 59264995, 24
-          tz.transition 2049, 4, :o2, 14817215, 6
-          tz.transition 2049, 10, :o1, 59273899, 24
-          tz.transition 2050, 4, :o2, 14819399, 6
-          tz.transition 2050, 10, :o1, 59282635, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/New_York.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/New_York.rb
deleted file mode 100644
index 7d802bd2de..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/New_York.rb
+++ /dev/null
@@ -1,282 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module New_York
-        include TimezoneDefinition
-        
-        timezone 'America/New_York' do |tz|
-          tz.offset :o0, -17762, 0, :LMT
-          tz.offset :o1, -18000, 0, :EST
-          tz.offset :o2, -18000, 3600, :EDT
-          tz.offset :o3, -18000, 3600, :EWT
-          tz.offset :o4, -18000, 3600, :EPT
-          
-          tz.transition 1883, 11, :o1, 57819197, 24
-          tz.transition 1918, 3, :o2, 58120411, 24
-          tz.transition 1918, 10, :o1, 9687575, 4
-          tz.transition 1919, 3, :o2, 58129147, 24
-          tz.transition 1919, 10, :o1, 9689031, 4
-          tz.transition 1920, 3, :o2, 58137883, 24
-          tz.transition 1920, 10, :o1, 9690515, 4
-          tz.transition 1921, 4, :o2, 58147291, 24
-          tz.transition 1921, 9, :o1, 9691831, 4
-          tz.transition 1922, 4, :o2, 58156195, 24
-          tz.transition 1922, 9, :o1, 9693287, 4
-          tz.transition 1923, 4, :o2, 58164931, 24
-          tz.transition 1923, 9, :o1, 9694771, 4
-          tz.transition 1924, 4, :o2, 58173667, 24
-          tz.transition 1924, 9, :o1, 9696227, 4
-          tz.transition 1925, 4, :o2, 58182403, 24
-          tz.transition 1925, 9, :o1, 9697683, 4
-          tz.transition 1926, 4, :o2, 58191139, 24
-          tz.transition 1926, 9, :o1, 9699139, 4
-          tz.transition 1927, 4, :o2, 58199875, 24
-          tz.transition 1927, 9, :o1, 9700595, 4
-          tz.transition 1928, 4, :o2, 58208779, 24
-          tz.transition 1928, 9, :o1, 9702079, 4
-          tz.transition 1929, 4, :o2, 58217515, 24
-          tz.transition 1929, 9, :o1, 9703535, 4
-          tz.transition 1930, 4, :o2, 58226251, 24
-          tz.transition 1930, 9, :o1, 9704991, 4
-          tz.transition 1931, 4, :o2, 58234987, 24
-          tz.transition 1931, 9, :o1, 9706447, 4
-          tz.transition 1932, 4, :o2, 58243723, 24
-          tz.transition 1932, 9, :o1, 9707903, 4
-          tz.transition 1933, 4, :o2, 58252627, 24
-          tz.transition 1933, 9, :o1, 9709359, 4
-          tz.transition 1934, 4, :o2, 58261363, 24
-          tz.transition 1934, 9, :o1, 9710843, 4
-          tz.transition 1935, 4, :o2, 58270099, 24
-          tz.transition 1935, 9, :o1, 9712299, 4
-          tz.transition 1936, 4, :o2, 58278835, 24
-          tz.transition 1936, 9, :o1, 9713755, 4
-          tz.transition 1937, 4, :o2, 58287571, 24
-          tz.transition 1937, 9, :o1, 9715211, 4
-          tz.transition 1938, 4, :o2, 58296307, 24
-          tz.transition 1938, 9, :o1, 9716667, 4
-          tz.transition 1939, 4, :o2, 58305211, 24
-          tz.transition 1939, 9, :o1, 9718123, 4
-          tz.transition 1940, 4, :o2, 58313947, 24
-          tz.transition 1940, 9, :o1, 9719607, 4
-          tz.transition 1941, 4, :o2, 58322683, 24
-          tz.transition 1941, 9, :o1, 9721063, 4
-          tz.transition 1942, 2, :o3, 58329595, 24
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 9726915, 4
-          tz.transition 1946, 4, :o2, 58366531, 24
-          tz.transition 1946, 9, :o1, 9728371, 4
-          tz.transition 1947, 4, :o2, 58375267, 24
-          tz.transition 1947, 9, :o1, 9729827, 4
-          tz.transition 1948, 4, :o2, 58384003, 24
-          tz.transition 1948, 9, :o1, 9731283, 4
-          tz.transition 1949, 4, :o2, 58392739, 24
-          tz.transition 1949, 9, :o1, 9732739, 4
-          tz.transition 1950, 4, :o2, 58401643, 24
-          tz.transition 1950, 9, :o1, 9734195, 4
-          tz.transition 1951, 4, :o2, 58410379, 24
-          tz.transition 1951, 9, :o1, 9735679, 4
-          tz.transition 1952, 4, :o2, 58419115, 24
-          tz.transition 1952, 9, :o1, 9737135, 4
-          tz.transition 1953, 4, :o2, 58427851, 24
-          tz.transition 1953, 9, :o1, 9738591, 4
-          tz.transition 1954, 4, :o2, 58436587, 24
-          tz.transition 1954, 9, :o1, 9740047, 4
-          tz.transition 1955, 4, :o2, 58445323, 24
-          tz.transition 1955, 10, :o1, 9741643, 4
-          tz.transition 1956, 4, :o2, 58454227, 24
-          tz.transition 1956, 10, :o1, 9743099, 4
-          tz.transition 1957, 4, :o2, 58462963, 24
-          tz.transition 1957, 10, :o1, 9744555, 4
-          tz.transition 1958, 4, :o2, 58471699, 24
-          tz.transition 1958, 10, :o1, 9746011, 4
-          tz.transition 1959, 4, :o2, 58480435, 24
-          tz.transition 1959, 10, :o1, 9747467, 4
-          tz.transition 1960, 4, :o2, 58489171, 24
-          tz.transition 1960, 10, :o1, 9748951, 4
-          tz.transition 1961, 4, :o2, 58498075, 24
-          tz.transition 1961, 10, :o1, 9750407, 4
-          tz.transition 1962, 4, :o2, 58506811, 24
-          tz.transition 1962, 10, :o1, 9751863, 4
-          tz.transition 1963, 4, :o2, 58515547, 24
-          tz.transition 1963, 10, :o1, 9753319, 4
-          tz.transition 1964, 4, :o2, 58524283, 24
-          tz.transition 1964, 10, :o1, 9754775, 4
-          tz.transition 1965, 4, :o2, 58533019, 24
-          tz.transition 1965, 10, :o1, 9756259, 4
-          tz.transition 1966, 4, :o2, 58541755, 24
-          tz.transition 1966, 10, :o1, 9757715, 4
-          tz.transition 1967, 4, :o2, 58550659, 24
-          tz.transition 1967, 10, :o1, 9759171, 4
-          tz.transition 1968, 4, :o2, 58559395, 24
-          tz.transition 1968, 10, :o1, 9760627, 4
-          tz.transition 1969, 4, :o2, 58568131, 24
-          tz.transition 1969, 10, :o1, 9762083, 4
-          tz.transition 1970, 4, :o2, 9961200
-          tz.transition 1970, 10, :o1, 25682400
-          tz.transition 1971, 4, :o2, 41410800
-          tz.transition 1971, 10, :o1, 57736800
-          tz.transition 1972, 4, :o2, 73465200
-          tz.transition 1972, 10, :o1, 89186400
-          tz.transition 1973, 4, :o2, 104914800
-          tz.transition 1973, 10, :o1, 120636000
-          tz.transition 1974, 1, :o2, 126687600
-          tz.transition 1974, 10, :o1, 152085600
-          tz.transition 1975, 2, :o2, 162370800
-          tz.transition 1975, 10, :o1, 183535200
-          tz.transition 1976, 4, :o2, 199263600
-          tz.transition 1976, 10, :o1, 215589600
-          tz.transition 1977, 4, :o2, 230713200
-          tz.transition 1977, 10, :o1, 247039200
-          tz.transition 1978, 4, :o2, 262767600
-          tz.transition 1978, 10, :o1, 278488800
-          tz.transition 1979, 4, :o2, 294217200
-          tz.transition 1979, 10, :o1, 309938400
-          tz.transition 1980, 4, :o2, 325666800
-          tz.transition 1980, 10, :o1, 341388000
-          tz.transition 1981, 4, :o2, 357116400
-          tz.transition 1981, 10, :o1, 372837600
-          tz.transition 1982, 4, :o2, 388566000
-          tz.transition 1982, 10, :o1, 404892000
-          tz.transition 1983, 4, :o2, 420015600
-          tz.transition 1983, 10, :o1, 436341600
-          tz.transition 1984, 4, :o2, 452070000
-          tz.transition 1984, 10, :o1, 467791200
-          tz.transition 1985, 4, :o2, 483519600
-          tz.transition 1985, 10, :o1, 499240800
-          tz.transition 1986, 4, :o2, 514969200
-          tz.transition 1986, 10, :o1, 530690400
-          tz.transition 1987, 4, :o2, 544604400
-          tz.transition 1987, 10, :o1, 562140000
-          tz.transition 1988, 4, :o2, 576054000
-          tz.transition 1988, 10, :o1, 594194400
-          tz.transition 1989, 4, :o2, 607503600
-          tz.transition 1989, 10, :o1, 625644000
-          tz.transition 1990, 4, :o2, 638953200
-          tz.transition 1990, 10, :o1, 657093600
-          tz.transition 1991, 4, :o2, 671007600
-          tz.transition 1991, 10, :o1, 688543200
-          tz.transition 1992, 4, :o2, 702457200
-          tz.transition 1992, 10, :o1, 719992800
-          tz.transition 1993, 4, :o2, 733906800
-          tz.transition 1993, 10, :o1, 752047200
-          tz.transition 1994, 4, :o2, 765356400
-          tz.transition 1994, 10, :o1, 783496800
-          tz.transition 1995, 4, :o2, 796806000
-          tz.transition 1995, 10, :o1, 814946400
-          tz.transition 1996, 4, :o2, 828860400
-          tz.transition 1996, 10, :o1, 846396000
-          tz.transition 1997, 4, :o2, 860310000
-          tz.transition 1997, 10, :o1, 877845600
-          tz.transition 1998, 4, :o2, 891759600
-          tz.transition 1998, 10, :o1, 909295200
-          tz.transition 1999, 4, :o2, 923209200
-          tz.transition 1999, 10, :o1, 941349600
-          tz.transition 2000, 4, :o2, 954658800
-          tz.transition 2000, 10, :o1, 972799200
-          tz.transition 2001, 4, :o2, 986108400
-          tz.transition 2001, 10, :o1, 1004248800
-          tz.transition 2002, 4, :o2, 1018162800
-          tz.transition 2002, 10, :o1, 1035698400
-          tz.transition 2003, 4, :o2, 1049612400
-          tz.transition 2003, 10, :o1, 1067148000
-          tz.transition 2004, 4, :o2, 1081062000
-          tz.transition 2004, 10, :o1, 1099202400
-          tz.transition 2005, 4, :o2, 1112511600
-          tz.transition 2005, 10, :o1, 1130652000
-          tz.transition 2006, 4, :o2, 1143961200
-          tz.transition 2006, 10, :o1, 1162101600
-          tz.transition 2007, 3, :o2, 1173596400
-          tz.transition 2007, 11, :o1, 1194156000
-          tz.transition 2008, 3, :o2, 1205046000
-          tz.transition 2008, 11, :o1, 1225605600
-          tz.transition 2009, 3, :o2, 1236495600
-          tz.transition 2009, 11, :o1, 1257055200
-          tz.transition 2010, 3, :o2, 1268550000
-          tz.transition 2010, 11, :o1, 1289109600
-          tz.transition 2011, 3, :o2, 1299999600
-          tz.transition 2011, 11, :o1, 1320559200
-          tz.transition 2012, 3, :o2, 1331449200
-          tz.transition 2012, 11, :o1, 1352008800
-          tz.transition 2013, 3, :o2, 1362898800
-          tz.transition 2013, 11, :o1, 1383458400
-          tz.transition 2014, 3, :o2, 1394348400
-          tz.transition 2014, 11, :o1, 1414908000
-          tz.transition 2015, 3, :o2, 1425798000
-          tz.transition 2015, 11, :o1, 1446357600
-          tz.transition 2016, 3, :o2, 1457852400
-          tz.transition 2016, 11, :o1, 1478412000
-          tz.transition 2017, 3, :o2, 1489302000
-          tz.transition 2017, 11, :o1, 1509861600
-          tz.transition 2018, 3, :o2, 1520751600
-          tz.transition 2018, 11, :o1, 1541311200
-          tz.transition 2019, 3, :o2, 1552201200
-          tz.transition 2019, 11, :o1, 1572760800
-          tz.transition 2020, 3, :o2, 1583650800
-          tz.transition 2020, 11, :o1, 1604210400
-          tz.transition 2021, 3, :o2, 1615705200
-          tz.transition 2021, 11, :o1, 1636264800
-          tz.transition 2022, 3, :o2, 1647154800
-          tz.transition 2022, 11, :o1, 1667714400
-          tz.transition 2023, 3, :o2, 1678604400
-          tz.transition 2023, 11, :o1, 1699164000
-          tz.transition 2024, 3, :o2, 1710054000
-          tz.transition 2024, 11, :o1, 1730613600
-          tz.transition 2025, 3, :o2, 1741503600
-          tz.transition 2025, 11, :o1, 1762063200
-          tz.transition 2026, 3, :o2, 1772953200
-          tz.transition 2026, 11, :o1, 1793512800
-          tz.transition 2027, 3, :o2, 1805007600
-          tz.transition 2027, 11, :o1, 1825567200
-          tz.transition 2028, 3, :o2, 1836457200
-          tz.transition 2028, 11, :o1, 1857016800
-          tz.transition 2029, 3, :o2, 1867906800
-          tz.transition 2029, 11, :o1, 1888466400
-          tz.transition 2030, 3, :o2, 1899356400
-          tz.transition 2030, 11, :o1, 1919916000
-          tz.transition 2031, 3, :o2, 1930806000
-          tz.transition 2031, 11, :o1, 1951365600
-          tz.transition 2032, 3, :o2, 1962860400
-          tz.transition 2032, 11, :o1, 1983420000
-          tz.transition 2033, 3, :o2, 1994310000
-          tz.transition 2033, 11, :o1, 2014869600
-          tz.transition 2034, 3, :o2, 2025759600
-          tz.transition 2034, 11, :o1, 2046319200
-          tz.transition 2035, 3, :o2, 2057209200
-          tz.transition 2035, 11, :o1, 2077768800
-          tz.transition 2036, 3, :o2, 2088658800
-          tz.transition 2036, 11, :o1, 2109218400
-          tz.transition 2037, 3, :o2, 2120108400
-          tz.transition 2037, 11, :o1, 2140668000
-          tz.transition 2038, 3, :o2, 59171923, 24
-          tz.transition 2038, 11, :o1, 9862939, 4
-          tz.transition 2039, 3, :o2, 59180659, 24
-          tz.transition 2039, 11, :o1, 9864395, 4
-          tz.transition 2040, 3, :o2, 59189395, 24
-          tz.transition 2040, 11, :o1, 9865851, 4
-          tz.transition 2041, 3, :o2, 59198131, 24
-          tz.transition 2041, 11, :o1, 9867307, 4
-          tz.transition 2042, 3, :o2, 59206867, 24
-          tz.transition 2042, 11, :o1, 9868763, 4
-          tz.transition 2043, 3, :o2, 59215603, 24
-          tz.transition 2043, 11, :o1, 9870219, 4
-          tz.transition 2044, 3, :o2, 59224507, 24
-          tz.transition 2044, 11, :o1, 9871703, 4
-          tz.transition 2045, 3, :o2, 59233243, 24
-          tz.transition 2045, 11, :o1, 9873159, 4
-          tz.transition 2046, 3, :o2, 59241979, 24
-          tz.transition 2046, 11, :o1, 9874615, 4
-          tz.transition 2047, 3, :o2, 59250715, 24
-          tz.transition 2047, 11, :o1, 9876071, 4
-          tz.transition 2048, 3, :o2, 59259451, 24
-          tz.transition 2048, 11, :o1, 9877527, 4
-          tz.transition 2049, 3, :o2, 59268355, 24
-          tz.transition 2049, 11, :o1, 9879011, 4
-          tz.transition 2050, 3, :o2, 59277091, 24
-          tz.transition 2050, 11, :o1, 9880467, 4
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Phoenix.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Phoenix.rb
deleted file mode 100644
index b514e0c0f9..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Phoenix.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Phoenix
-        include TimezoneDefinition
-        
-        timezone 'America/Phoenix' do |tz|
-          tz.offset :o0, -26898, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -25200, 3600, :MDT
-          tz.offset :o3, -25200, 3600, :MWT
-          
-          tz.transition 1883, 11, :o1, 57819199, 24
-          tz.transition 1918, 3, :o2, 19373471, 8
-          tz.transition 1918, 10, :o1, 14531363, 6
-          tz.transition 1919, 3, :o2, 19376383, 8
-          tz.transition 1919, 10, :o1, 14533547, 6
-          tz.transition 1942, 2, :o3, 19443199, 8
-          tz.transition 1944, 1, :o1, 3500770681, 1440
-          tz.transition 1944, 4, :o3, 3500901781, 1440
-          tz.transition 1944, 10, :o1, 3501165241, 1440
-          tz.transition 1967, 4, :o2, 19516887, 8
-          tz.transition 1967, 10, :o1, 14638757, 6
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Regina.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Regina.rb
deleted file mode 100644
index ebdb68814a..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Regina.rb
+++ /dev/null
@@ -1,74 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Regina
-        include TimezoneDefinition
-        
-        timezone 'America/Regina' do |tz|
-          tz.offset :o0, -25116, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -25200, 3600, :MDT
-          tz.offset :o3, -25200, 3600, :MWT
-          tz.offset :o4, -25200, 3600, :MPT
-          tz.offset :o5, -21600, 0, :CST
-          
-          tz.transition 1905, 9, :o1, 17403046493, 7200
-          tz.transition 1918, 4, :o2, 19373583, 8
-          tz.transition 1918, 10, :o1, 14531387, 6
-          tz.transition 1930, 5, :o2, 58226419, 24
-          tz.transition 1930, 10, :o1, 9705019, 4
-          tz.transition 1931, 5, :o2, 58235155, 24
-          tz.transition 1931, 10, :o1, 9706475, 4
-          tz.transition 1932, 5, :o2, 58243891, 24
-          tz.transition 1932, 10, :o1, 9707931, 4
-          tz.transition 1933, 5, :o2, 58252795, 24
-          tz.transition 1933, 10, :o1, 9709387, 4
-          tz.transition 1934, 5, :o2, 58261531, 24
-          tz.transition 1934, 10, :o1, 9710871, 4
-          tz.transition 1937, 4, :o2, 58287235, 24
-          tz.transition 1937, 10, :o1, 9715267, 4
-          tz.transition 1938, 4, :o2, 58295971, 24
-          tz.transition 1938, 10, :o1, 9716695, 4
-          tz.transition 1939, 4, :o2, 58304707, 24
-          tz.transition 1939, 10, :o1, 9718179, 4
-          tz.transition 1940, 4, :o2, 58313611, 24
-          tz.transition 1940, 10, :o1, 9719663, 4
-          tz.transition 1941, 4, :o2, 58322347, 24
-          tz.transition 1941, 10, :o1, 9721119, 4
-          tz.transition 1942, 2, :o3, 19443199, 8
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 14590373, 6
-          tz.transition 1946, 4, :o2, 19455399, 8
-          tz.transition 1946, 10, :o1, 14592641, 6
-          tz.transition 1947, 4, :o2, 19458423, 8
-          tz.transition 1947, 9, :o1, 14594741, 6
-          tz.transition 1948, 4, :o2, 19461335, 8
-          tz.transition 1948, 9, :o1, 14596925, 6
-          tz.transition 1949, 4, :o2, 19464247, 8
-          tz.transition 1949, 9, :o1, 14599109, 6
-          tz.transition 1950, 4, :o2, 19467215, 8
-          tz.transition 1950, 9, :o1, 14601293, 6
-          tz.transition 1951, 4, :o2, 19470127, 8
-          tz.transition 1951, 9, :o1, 14603519, 6
-          tz.transition 1952, 4, :o2, 19473039, 8
-          tz.transition 1952, 9, :o1, 14605703, 6
-          tz.transition 1953, 4, :o2, 19475951, 8
-          tz.transition 1953, 9, :o1, 14607887, 6
-          tz.transition 1954, 4, :o2, 19478863, 8
-          tz.transition 1954, 9, :o1, 14610071, 6
-          tz.transition 1955, 4, :o2, 19481775, 8
-          tz.transition 1955, 9, :o1, 14612255, 6
-          tz.transition 1956, 4, :o2, 19484743, 8
-          tz.transition 1956, 9, :o1, 14614481, 6
-          tz.transition 1957, 4, :o2, 19487655, 8
-          tz.transition 1957, 9, :o1, 14616665, 6
-          tz.transition 1959, 4, :o2, 19493479, 8
-          tz.transition 1959, 10, :o1, 14621201, 6
-          tz.transition 1960, 4, :o5, 19496391, 8
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Santiago.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Santiago.rb
deleted file mode 100644
index 0287c9ebc4..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Santiago.rb
+++ /dev/null
@@ -1,205 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Santiago
-        include TimezoneDefinition
-        
-        timezone 'America/Santiago' do |tz|
-          tz.offset :o0, -16966, 0, :LMT
-          tz.offset :o1, -16966, 0, :SMT
-          tz.offset :o2, -18000, 0, :CLT
-          tz.offset :o3, -14400, 0, :CLT
-          tz.offset :o4, -18000, 3600, :CLST
-          tz.offset :o5, -14400, 3600, :CLST
-          
-          tz.transition 1890, 1, :o1, 104171127683, 43200
-          tz.transition 1910, 1, :o2, 104486660483, 43200
-          tz.transition 1916, 7, :o1, 58105097, 24
-          tz.transition 1918, 9, :o3, 104623388483, 43200
-          tz.transition 1919, 7, :o1, 7266422, 3
-          tz.transition 1927, 9, :o4, 104765386883, 43200
-          tz.transition 1928, 4, :o2, 7276013, 3
-          tz.transition 1928, 9, :o4, 58211777, 24
-          tz.transition 1929, 4, :o2, 7277108, 3
-          tz.transition 1929, 9, :o4, 58220537, 24
-          tz.transition 1930, 4, :o2, 7278203, 3
-          tz.transition 1930, 9, :o4, 58229297, 24
-          tz.transition 1931, 4, :o2, 7279298, 3
-          tz.transition 1931, 9, :o4, 58238057, 24
-          tz.transition 1932, 4, :o2, 7280396, 3
-          tz.transition 1932, 9, :o4, 58246841, 24
-          tz.transition 1942, 6, :o2, 7291535, 3
-          tz.transition 1942, 8, :o4, 58333745, 24
-          tz.transition 1946, 9, :o2, 19456517, 8
-          tz.transition 1947, 5, :o3, 58375865, 24
-          tz.transition 1968, 11, :o5, 7320491, 3
-          tz.transition 1969, 3, :o3, 19522485, 8
-          tz.transition 1969, 11, :o5, 7321646, 3
-          tz.transition 1970, 3, :o3, 7527600
-          tz.transition 1970, 10, :o5, 24465600
-          tz.transition 1971, 3, :o3, 37767600
-          tz.transition 1971, 10, :o5, 55915200
-          tz.transition 1972, 3, :o3, 69217200
-          tz.transition 1972, 10, :o5, 87969600
-          tz.transition 1973, 3, :o3, 100666800
-          tz.transition 1973, 9, :o5, 118209600
-          tz.transition 1974, 3, :o3, 132116400
-          tz.transition 1974, 10, :o5, 150868800
-          tz.transition 1975, 3, :o3, 163566000
-          tz.transition 1975, 10, :o5, 182318400
-          tz.transition 1976, 3, :o3, 195620400
-          tz.transition 1976, 10, :o5, 213768000
-          tz.transition 1977, 3, :o3, 227070000
-          tz.transition 1977, 10, :o5, 245217600
-          tz.transition 1978, 3, :o3, 258519600
-          tz.transition 1978, 10, :o5, 277272000
-          tz.transition 1979, 3, :o3, 289969200
-          tz.transition 1979, 10, :o5, 308721600
-          tz.transition 1980, 3, :o3, 321418800
-          tz.transition 1980, 10, :o5, 340171200
-          tz.transition 1981, 3, :o3, 353473200
-          tz.transition 1981, 10, :o5, 371620800
-          tz.transition 1982, 3, :o3, 384922800
-          tz.transition 1982, 10, :o5, 403070400
-          tz.transition 1983, 3, :o3, 416372400
-          tz.transition 1983, 10, :o5, 434520000
-          tz.transition 1984, 3, :o3, 447822000
-          tz.transition 1984, 10, :o5, 466574400
-          tz.transition 1985, 3, :o3, 479271600
-          tz.transition 1985, 10, :o5, 498024000
-          tz.transition 1986, 3, :o3, 510721200
-          tz.transition 1986, 10, :o5, 529473600
-          tz.transition 1987, 4, :o3, 545194800
-          tz.transition 1987, 10, :o5, 560923200
-          tz.transition 1988, 3, :o3, 574225200
-          tz.transition 1988, 10, :o5, 591768000
-          tz.transition 1989, 3, :o3, 605674800
-          tz.transition 1989, 10, :o5, 624427200
-          tz.transition 1990, 3, :o3, 637729200
-          tz.transition 1990, 9, :o5, 653457600
-          tz.transition 1991, 3, :o3, 668574000
-          tz.transition 1991, 10, :o5, 687326400
-          tz.transition 1992, 3, :o3, 700628400
-          tz.transition 1992, 10, :o5, 718776000
-          tz.transition 1993, 3, :o3, 732078000
-          tz.transition 1993, 10, :o5, 750225600
-          tz.transition 1994, 3, :o3, 763527600
-          tz.transition 1994, 10, :o5, 781675200
-          tz.transition 1995, 3, :o3, 794977200
-          tz.transition 1995, 10, :o5, 813729600
-          tz.transition 1996, 3, :o3, 826426800
-          tz.transition 1996, 10, :o5, 845179200
-          tz.transition 1997, 3, :o3, 859690800
-          tz.transition 1997, 10, :o5, 876628800
-          tz.transition 1998, 3, :o3, 889930800
-          tz.transition 1998, 9, :o5, 906868800
-          tz.transition 1999, 4, :o3, 923194800
-          tz.transition 1999, 10, :o5, 939528000
-          tz.transition 2000, 3, :o3, 952830000
-          tz.transition 2000, 10, :o5, 971582400
-          tz.transition 2001, 3, :o3, 984279600
-          tz.transition 2001, 10, :o5, 1003032000
-          tz.transition 2002, 3, :o3, 1015729200
-          tz.transition 2002, 10, :o5, 1034481600
-          tz.transition 2003, 3, :o3, 1047178800
-          tz.transition 2003, 10, :o5, 1065931200
-          tz.transition 2004, 3, :o3, 1079233200
-          tz.transition 2004, 10, :o5, 1097380800
-          tz.transition 2005, 3, :o3, 1110682800
-          tz.transition 2005, 10, :o5, 1128830400
-          tz.transition 2006, 3, :o3, 1142132400
-          tz.transition 2006, 10, :o5, 1160884800
-          tz.transition 2007, 3, :o3, 1173582000
-          tz.transition 2007, 10, :o5, 1192334400
-          tz.transition 2008, 3, :o3, 1206846000
-          tz.transition 2008, 10, :o5, 1223784000
-          tz.transition 2009, 3, :o3, 1237086000
-          tz.transition 2009, 10, :o5, 1255233600
-          tz.transition 2010, 3, :o3, 1268535600
-          tz.transition 2010, 10, :o5, 1286683200
-          tz.transition 2011, 3, :o3, 1299985200
-          tz.transition 2011, 10, :o5, 1318132800
-          tz.transition 2012, 3, :o3, 1331434800
-          tz.transition 2012, 10, :o5, 1350187200
-          tz.transition 2013, 3, :o3, 1362884400
-          tz.transition 2013, 10, :o5, 1381636800
-          tz.transition 2014, 3, :o3, 1394334000
-          tz.transition 2014, 10, :o5, 1413086400
-          tz.transition 2015, 3, :o3, 1426388400
-          tz.transition 2015, 10, :o5, 1444536000
-          tz.transition 2016, 3, :o3, 1457838000
-          tz.transition 2016, 10, :o5, 1475985600
-          tz.transition 2017, 3, :o3, 1489287600
-          tz.transition 2017, 10, :o5, 1508040000
-          tz.transition 2018, 3, :o3, 1520737200
-          tz.transition 2018, 10, :o5, 1539489600
-          tz.transition 2019, 3, :o3, 1552186800
-          tz.transition 2019, 10, :o5, 1570939200
-          tz.transition 2020, 3, :o3, 1584241200
-          tz.transition 2020, 10, :o5, 1602388800
-          tz.transition 2021, 3, :o3, 1615690800
-          tz.transition 2021, 10, :o5, 1633838400
-          tz.transition 2022, 3, :o3, 1647140400
-          tz.transition 2022, 10, :o5, 1665288000
-          tz.transition 2023, 3, :o3, 1678590000
-          tz.transition 2023, 10, :o5, 1697342400
-          tz.transition 2024, 3, :o3, 1710039600
-          tz.transition 2024, 10, :o5, 1728792000
-          tz.transition 2025, 3, :o3, 1741489200
-          tz.transition 2025, 10, :o5, 1760241600
-          tz.transition 2026, 3, :o3, 1773543600
-          tz.transition 2026, 10, :o5, 1791691200
-          tz.transition 2027, 3, :o3, 1804993200
-          tz.transition 2027, 10, :o5, 1823140800
-          tz.transition 2028, 3, :o3, 1836442800
-          tz.transition 2028, 10, :o5, 1855195200
-          tz.transition 2029, 3, :o3, 1867892400
-          tz.transition 2029, 10, :o5, 1886644800
-          tz.transition 2030, 3, :o3, 1899342000
-          tz.transition 2030, 10, :o5, 1918094400
-          tz.transition 2031, 3, :o3, 1930791600
-          tz.transition 2031, 10, :o5, 1949544000
-          tz.transition 2032, 3, :o3, 1962846000
-          tz.transition 2032, 10, :o5, 1980993600
-          tz.transition 2033, 3, :o3, 1994295600
-          tz.transition 2033, 10, :o5, 2012443200
-          tz.transition 2034, 3, :o3, 2025745200
-          tz.transition 2034, 10, :o5, 2044497600
-          tz.transition 2035, 3, :o3, 2057194800
-          tz.transition 2035, 10, :o5, 2075947200
-          tz.transition 2036, 3, :o3, 2088644400
-          tz.transition 2036, 10, :o5, 2107396800
-          tz.transition 2037, 3, :o3, 2120698800
-          tz.transition 2037, 10, :o5, 2138846400
-          tz.transition 2038, 3, :o3, 19723973, 8
-          tz.transition 2038, 10, :o5, 7397120, 3
-          tz.transition 2039, 3, :o3, 19726885, 8
-          tz.transition 2039, 10, :o5, 7398212, 3
-          tz.transition 2040, 3, :o3, 19729797, 8
-          tz.transition 2040, 10, :o5, 7399325, 3
-          tz.transition 2041, 3, :o3, 19732709, 8
-          tz.transition 2041, 10, :o5, 7400417, 3
-          tz.transition 2042, 3, :o3, 19735621, 8
-          tz.transition 2042, 10, :o5, 7401509, 3
-          tz.transition 2043, 3, :o3, 19738589, 8
-          tz.transition 2043, 10, :o5, 7402601, 3
-          tz.transition 2044, 3, :o3, 19741501, 8
-          tz.transition 2044, 10, :o5, 7403693, 3
-          tz.transition 2045, 3, :o3, 19744413, 8
-          tz.transition 2045, 10, :o5, 7404806, 3
-          tz.transition 2046, 3, :o3, 19747325, 8
-          tz.transition 2046, 10, :o5, 7405898, 3
-          tz.transition 2047, 3, :o3, 19750237, 8
-          tz.transition 2047, 10, :o5, 7406990, 3
-          tz.transition 2048, 3, :o3, 19753205, 8
-          tz.transition 2048, 10, :o5, 7408082, 3
-          tz.transition 2049, 3, :o3, 19756117, 8
-          tz.transition 2049, 10, :o5, 7409174, 3
-          tz.transition 2050, 3, :o3, 19759029, 8
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Sao_Paulo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Sao_Paulo.rb
deleted file mode 100644
index 0524f81c04..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Sao_Paulo.rb
+++ /dev/null
@@ -1,171 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Sao_Paulo
-        include TimezoneDefinition
-        
-        timezone 'America/Sao_Paulo' do |tz|
-          tz.offset :o0, -11188, 0, :LMT
-          tz.offset :o1, -10800, 0, :BRT
-          tz.offset :o2, -10800, 3600, :BRST
-          
-          tz.transition 1914, 1, :o1, 52274886397, 21600
-          tz.transition 1931, 10, :o2, 29119417, 12
-          tz.transition 1932, 4, :o1, 29121583, 12
-          tz.transition 1932, 10, :o2, 19415869, 8
-          tz.transition 1933, 4, :o1, 29125963, 12
-          tz.transition 1949, 12, :o2, 19466013, 8
-          tz.transition 1950, 4, :o1, 19467101, 8
-          tz.transition 1950, 12, :o2, 19468933, 8
-          tz.transition 1951, 4, :o1, 29204851, 12
-          tz.transition 1951, 12, :o2, 19471853, 8
-          tz.transition 1952, 4, :o1, 29209243, 12
-          tz.transition 1952, 12, :o2, 19474781, 8
-          tz.transition 1953, 3, :o1, 29213251, 12
-          tz.transition 1963, 10, :o2, 19506605, 8
-          tz.transition 1964, 3, :o1, 29261467, 12
-          tz.transition 1965, 1, :o2, 19510333, 8
-          tz.transition 1965, 3, :o1, 29266207, 12
-          tz.transition 1965, 12, :o2, 19512765, 8
-          tz.transition 1966, 3, :o1, 29270227, 12
-          tz.transition 1966, 11, :o2, 19515445, 8
-          tz.transition 1967, 3, :o1, 29274607, 12
-          tz.transition 1967, 11, :o2, 19518365, 8
-          tz.transition 1968, 3, :o1, 29278999, 12
-          tz.transition 1985, 11, :o2, 499748400
-          tz.transition 1986, 3, :o1, 511236000
-          tz.transition 1986, 10, :o2, 530593200
-          tz.transition 1987, 2, :o1, 540266400
-          tz.transition 1987, 10, :o2, 562129200
-          tz.transition 1988, 2, :o1, 571197600
-          tz.transition 1988, 10, :o2, 592974000
-          tz.transition 1989, 1, :o1, 602042400
-          tz.transition 1989, 10, :o2, 624423600
-          tz.transition 1990, 2, :o1, 634701600
-          tz.transition 1990, 10, :o2, 656478000
-          tz.transition 1991, 2, :o1, 666756000
-          tz.transition 1991, 10, :o2, 687927600
-          tz.transition 1992, 2, :o1, 697600800
-          tz.transition 1992, 10, :o2, 719982000
-          tz.transition 1993, 1, :o1, 728445600
-          tz.transition 1993, 10, :o2, 750826800
-          tz.transition 1994, 2, :o1, 761709600
-          tz.transition 1994, 10, :o2, 782276400
-          tz.transition 1995, 2, :o1, 793159200
-          tz.transition 1995, 10, :o2, 813726000
-          tz.transition 1996, 2, :o1, 824004000
-          tz.transition 1996, 10, :o2, 844570800
-          tz.transition 1997, 2, :o1, 856058400
-          tz.transition 1997, 10, :o2, 876106800
-          tz.transition 1998, 3, :o1, 888717600
-          tz.transition 1998, 10, :o2, 908074800
-          tz.transition 1999, 2, :o1, 919562400
-          tz.transition 1999, 10, :o2, 938919600
-          tz.transition 2000, 2, :o1, 951616800
-          tz.transition 2000, 10, :o2, 970974000
-          tz.transition 2001, 2, :o1, 982461600
-          tz.transition 2001, 10, :o2, 1003028400
-          tz.transition 2002, 2, :o1, 1013911200
-          tz.transition 2002, 11, :o2, 1036292400
-          tz.transition 2003, 2, :o1, 1045360800
-          tz.transition 2003, 10, :o2, 1066532400
-          tz.transition 2004, 2, :o1, 1076810400
-          tz.transition 2004, 11, :o2, 1099364400
-          tz.transition 2005, 2, :o1, 1108864800
-          tz.transition 2005, 10, :o2, 1129431600
-          tz.transition 2006, 2, :o1, 1140314400
-          tz.transition 2006, 11, :o2, 1162695600
-          tz.transition 2007, 2, :o1, 1172368800
-          tz.transition 2007, 10, :o2, 1192330800
-          tz.transition 2008, 2, :o1, 1203213600
-          tz.transition 2008, 10, :o2, 1224385200
-          tz.transition 2009, 2, :o1, 1234663200
-          tz.transition 2009, 10, :o2, 1255834800
-          tz.transition 2010, 2, :o1, 1266717600
-          tz.transition 2010, 10, :o2, 1287284400
-          tz.transition 2011, 2, :o1, 1298167200
-          tz.transition 2011, 10, :o2, 1318734000
-          tz.transition 2012, 2, :o1, 1330221600
-          tz.transition 2012, 10, :o2, 1350788400
-          tz.transition 2013, 2, :o1, 1361066400
-          tz.transition 2013, 10, :o2, 1382238000
-          tz.transition 2014, 2, :o1, 1392516000
-          tz.transition 2014, 10, :o2, 1413687600
-          tz.transition 2015, 2, :o1, 1424570400
-          tz.transition 2015, 10, :o2, 1445137200
-          tz.transition 2016, 2, :o1, 1456020000
-          tz.transition 2016, 10, :o2, 1476586800
-          tz.transition 2017, 2, :o1, 1487469600
-          tz.transition 2017, 10, :o2, 1508036400
-          tz.transition 2018, 2, :o1, 1518919200
-          tz.transition 2018, 10, :o2, 1540090800
-          tz.transition 2019, 2, :o1, 1550368800
-          tz.transition 2019, 10, :o2, 1571540400
-          tz.transition 2020, 2, :o1, 1581818400
-          tz.transition 2020, 10, :o2, 1602990000
-          tz.transition 2021, 2, :o1, 1613872800
-          tz.transition 2021, 10, :o2, 1634439600
-          tz.transition 2022, 2, :o1, 1645322400
-          tz.transition 2022, 10, :o2, 1665889200
-          tz.transition 2023, 2, :o1, 1677376800
-          tz.transition 2023, 10, :o2, 1697338800
-          tz.transition 2024, 2, :o1, 1708221600
-          tz.transition 2024, 10, :o2, 1729393200
-          tz.transition 2025, 2, :o1, 1739671200
-          tz.transition 2025, 10, :o2, 1760842800
-          tz.transition 2026, 2, :o1, 1771725600
-          tz.transition 2026, 10, :o2, 1792292400
-          tz.transition 2027, 2, :o1, 1803175200
-          tz.transition 2027, 10, :o2, 1823742000
-          tz.transition 2028, 2, :o1, 1834624800
-          tz.transition 2028, 10, :o2, 1855191600
-          tz.transition 2029, 2, :o1, 1866074400
-          tz.transition 2029, 10, :o2, 1887246000
-          tz.transition 2030, 2, :o1, 1897524000
-          tz.transition 2030, 10, :o2, 1918695600
-          tz.transition 2031, 2, :o1, 1928973600
-          tz.transition 2031, 10, :o2, 1950145200
-          tz.transition 2032, 2, :o1, 1960423200
-          tz.transition 2032, 10, :o2, 1981594800
-          tz.transition 2033, 2, :o1, 1992477600
-          tz.transition 2033, 10, :o2, 2013044400
-          tz.transition 2034, 2, :o1, 2024532000
-          tz.transition 2034, 10, :o2, 2044494000
-          tz.transition 2035, 2, :o1, 2055376800
-          tz.transition 2035, 10, :o2, 2076548400
-          tz.transition 2036, 2, :o1, 2086826400
-          tz.transition 2036, 10, :o2, 2107998000
-          tz.transition 2037, 2, :o1, 2118880800
-          tz.transition 2037, 10, :o2, 2139447600
-          tz.transition 2038, 2, :o1, 29585707, 12
-          tz.transition 2038, 10, :o2, 19725709, 8
-          tz.transition 2039, 2, :o1, 29590075, 12
-          tz.transition 2039, 10, :o2, 19728621, 8
-          tz.transition 2040, 2, :o1, 29594443, 12
-          tz.transition 2040, 10, :o2, 19731589, 8
-          tz.transition 2041, 2, :o1, 29598811, 12
-          tz.transition 2041, 10, :o2, 19734501, 8
-          tz.transition 2042, 2, :o1, 29603179, 12
-          tz.transition 2042, 10, :o2, 19737413, 8
-          tz.transition 2043, 2, :o1, 29607547, 12
-          tz.transition 2043, 10, :o2, 19740325, 8
-          tz.transition 2044, 2, :o1, 29611999, 12
-          tz.transition 2044, 10, :o2, 19743237, 8
-          tz.transition 2045, 2, :o1, 29616367, 12
-          tz.transition 2045, 10, :o2, 19746149, 8
-          tz.transition 2046, 2, :o1, 29620735, 12
-          tz.transition 2046, 10, :o2, 19749117, 8
-          tz.transition 2047, 2, :o1, 29625103, 12
-          tz.transition 2047, 10, :o2, 19752029, 8
-          tz.transition 2048, 2, :o1, 29629471, 12
-          tz.transition 2048, 10, :o2, 19754941, 8
-          tz.transition 2049, 2, :o1, 29633923, 12
-          tz.transition 2049, 10, :o2, 19757853, 8
-          tz.transition 2050, 2, :o1, 29638291, 12
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/St_Johns.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/St_Johns.rb
deleted file mode 100644
index e4a3599d35..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/St_Johns.rb
+++ /dev/null
@@ -1,288 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module St_Johns
-        include TimezoneDefinition
-        
-        timezone 'America/St_Johns' do |tz|
-          tz.offset :o0, -12652, 0, :LMT
-          tz.offset :o1, -12652, 0, :NST
-          tz.offset :o2, -12652, 3600, :NDT
-          tz.offset :o3, -12600, 0, :NST
-          tz.offset :o4, -12600, 3600, :NDT
-          tz.offset :o5, -12600, 3600, :NWT
-          tz.offset :o6, -12600, 3600, :NPT
-          tz.offset :o7, -12600, 7200, :NDDT
-          
-          tz.transition 1884, 1, :o1, 52038215563, 21600
-          tz.transition 1917, 4, :o2, 52300657363, 21600
-          tz.transition 1917, 9, :o1, 52304155663, 21600
-          tz.transition 1918, 4, :o2, 52308670963, 21600
-          tz.transition 1918, 10, :o1, 52312990063, 21600
-          tz.transition 1919, 5, :o2, 52317027463, 21600
-          tz.transition 1919, 8, :o1, 52319164963, 21600
-          tz.transition 1920, 5, :o2, 52324868263, 21600
-          tz.transition 1920, 11, :o1, 52328798563, 21600
-          tz.transition 1921, 5, :o2, 52332730663, 21600
-          tz.transition 1921, 10, :o1, 52336660963, 21600
-          tz.transition 1922, 5, :o2, 52340744263, 21600
-          tz.transition 1922, 10, :o1, 52344523363, 21600
-          tz.transition 1923, 5, :o2, 52348606663, 21600
-          tz.transition 1923, 10, :o1, 52352385763, 21600
-          tz.transition 1924, 5, :o2, 52356469063, 21600
-          tz.transition 1924, 10, :o1, 52360248163, 21600
-          tz.transition 1925, 5, :o2, 52364331463, 21600
-          tz.transition 1925, 10, :o1, 52368110563, 21600
-          tz.transition 1926, 5, :o2, 52372193863, 21600
-          tz.transition 1926, 11, :o1, 52376124163, 21600
-          tz.transition 1927, 5, :o2, 52380056263, 21600
-          tz.transition 1927, 10, :o1, 52383986563, 21600
-          tz.transition 1928, 5, :o2, 52388069863, 21600
-          tz.transition 1928, 10, :o1, 52391848963, 21600
-          tz.transition 1929, 5, :o2, 52395932263, 21600
-          tz.transition 1929, 10, :o1, 52399711363, 21600
-          tz.transition 1930, 5, :o2, 52403794663, 21600
-          tz.transition 1930, 10, :o1, 52407573763, 21600
-          tz.transition 1931, 5, :o2, 52411657063, 21600
-          tz.transition 1931, 10, :o1, 52415436163, 21600
-          tz.transition 1932, 5, :o2, 52419519463, 21600
-          tz.transition 1932, 10, :o1, 52423449763, 21600
-          tz.transition 1933, 5, :o2, 52427533063, 21600
-          tz.transition 1933, 10, :o1, 52431312163, 21600
-          tz.transition 1934, 5, :o2, 52435395463, 21600
-          tz.transition 1934, 10, :o1, 52439174563, 21600
-          tz.transition 1935, 3, :o3, 52442459563, 21600
-          tz.transition 1935, 5, :o4, 116540573, 48
-          tz.transition 1935, 10, :o3, 38849657, 16
-          tz.transition 1936, 5, :o4, 116558383, 48
-          tz.transition 1936, 10, :o3, 116565437, 48
-          tz.transition 1937, 5, :o4, 116575855, 48
-          tz.transition 1937, 10, :o3, 116582909, 48
-          tz.transition 1938, 5, :o4, 116593327, 48
-          tz.transition 1938, 10, :o3, 116600381, 48
-          tz.transition 1939, 5, :o4, 116611135, 48
-          tz.transition 1939, 10, :o3, 116617853, 48
-          tz.transition 1940, 5, :o4, 116628607, 48
-          tz.transition 1940, 10, :o3, 116635661, 48
-          tz.transition 1941, 5, :o4, 116646079, 48
-          tz.transition 1941, 10, :o3, 116653133, 48
-          tz.transition 1942, 5, :o5, 116663551, 48
-          tz.transition 1945, 8, :o6, 58360379, 24
-          tz.transition 1945, 9, :o3, 38907659, 16
-          tz.transition 1946, 5, :o4, 116733731, 48
-          tz.transition 1946, 10, :o3, 38913595, 16
-          tz.transition 1947, 5, :o4, 116751203, 48
-          tz.transition 1947, 10, :o3, 38919419, 16
-          tz.transition 1948, 5, :o4, 116768675, 48
-          tz.transition 1948, 10, :o3, 38925243, 16
-          tz.transition 1949, 5, :o4, 116786147, 48
-          tz.transition 1949, 10, :o3, 38931067, 16
-          tz.transition 1950, 5, :o4, 116803955, 48
-          tz.transition 1950, 10, :o3, 38937003, 16
-          tz.transition 1951, 4, :o4, 116820755, 48
-          tz.transition 1951, 9, :o3, 38942715, 16
-          tz.transition 1952, 4, :o4, 116838227, 48
-          tz.transition 1952, 9, :o3, 38948539, 16
-          tz.transition 1953, 4, :o4, 116855699, 48
-          tz.transition 1953, 9, :o3, 38954363, 16
-          tz.transition 1954, 4, :o4, 116873171, 48
-          tz.transition 1954, 9, :o3, 38960187, 16
-          tz.transition 1955, 4, :o4, 116890643, 48
-          tz.transition 1955, 9, :o3, 38966011, 16
-          tz.transition 1956, 4, :o4, 116908451, 48
-          tz.transition 1956, 9, :o3, 38971947, 16
-          tz.transition 1957, 4, :o4, 116925923, 48
-          tz.transition 1957, 9, :o3, 38977771, 16
-          tz.transition 1958, 4, :o4, 116943395, 48
-          tz.transition 1958, 9, :o3, 38983595, 16
-          tz.transition 1959, 4, :o4, 116960867, 48
-          tz.transition 1959, 9, :o3, 38989419, 16
-          tz.transition 1960, 4, :o4, 116978339, 48
-          tz.transition 1960, 10, :o3, 38995803, 16
-          tz.transition 1961, 4, :o4, 116996147, 48
-          tz.transition 1961, 10, :o3, 39001627, 16
-          tz.transition 1962, 4, :o4, 117013619, 48
-          tz.transition 1962, 10, :o3, 39007451, 16
-          tz.transition 1963, 4, :o4, 117031091, 48
-          tz.transition 1963, 10, :o3, 39013275, 16
-          tz.transition 1964, 4, :o4, 117048563, 48
-          tz.transition 1964, 10, :o3, 39019099, 16
-          tz.transition 1965, 4, :o4, 117066035, 48
-          tz.transition 1965, 10, :o3, 39025035, 16
-          tz.transition 1966, 4, :o4, 117083507, 48
-          tz.transition 1966, 10, :o3, 39030859, 16
-          tz.transition 1967, 4, :o4, 117101315, 48
-          tz.transition 1967, 10, :o3, 39036683, 16
-          tz.transition 1968, 4, :o4, 117118787, 48
-          tz.transition 1968, 10, :o3, 39042507, 16
-          tz.transition 1969, 4, :o4, 117136259, 48
-          tz.transition 1969, 10, :o3, 39048331, 16
-          tz.transition 1970, 4, :o4, 9955800
-          tz.transition 1970, 10, :o3, 25677000
-          tz.transition 1971, 4, :o4, 41405400
-          tz.transition 1971, 10, :o3, 57731400
-          tz.transition 1972, 4, :o4, 73459800
-          tz.transition 1972, 10, :o3, 89181000
-          tz.transition 1973, 4, :o4, 104909400
-          tz.transition 1973, 10, :o3, 120630600
-          tz.transition 1974, 4, :o4, 136359000
-          tz.transition 1974, 10, :o3, 152080200
-          tz.transition 1975, 4, :o4, 167808600
-          tz.transition 1975, 10, :o3, 183529800
-          tz.transition 1976, 4, :o4, 199258200
-          tz.transition 1976, 10, :o3, 215584200
-          tz.transition 1977, 4, :o4, 230707800
-          tz.transition 1977, 10, :o3, 247033800
-          tz.transition 1978, 4, :o4, 262762200
-          tz.transition 1978, 10, :o3, 278483400
-          tz.transition 1979, 4, :o4, 294211800
-          tz.transition 1979, 10, :o3, 309933000
-          tz.transition 1980, 4, :o4, 325661400
-          tz.transition 1980, 10, :o3, 341382600
-          tz.transition 1981, 4, :o4, 357111000
-          tz.transition 1981, 10, :o3, 372832200
-          tz.transition 1982, 4, :o4, 388560600
-          tz.transition 1982, 10, :o3, 404886600
-          tz.transition 1983, 4, :o4, 420010200
-          tz.transition 1983, 10, :o3, 436336200
-          tz.transition 1984, 4, :o4, 452064600
-          tz.transition 1984, 10, :o3, 467785800
-          tz.transition 1985, 4, :o4, 483514200
-          tz.transition 1985, 10, :o3, 499235400
-          tz.transition 1986, 4, :o4, 514963800
-          tz.transition 1986, 10, :o3, 530685000
-          tz.transition 1987, 4, :o4, 544591860
-          tz.transition 1987, 10, :o3, 562127460
-          tz.transition 1988, 4, :o7, 576041460
-          tz.transition 1988, 10, :o3, 594178260
-          tz.transition 1989, 4, :o4, 607491060
-          tz.transition 1989, 10, :o3, 625631460
-          tz.transition 1990, 4, :o4, 638940660
-          tz.transition 1990, 10, :o3, 657081060
-          tz.transition 1991, 4, :o4, 670995060
-          tz.transition 1991, 10, :o3, 688530660
-          tz.transition 1992, 4, :o4, 702444660
-          tz.transition 1992, 10, :o3, 719980260
-          tz.transition 1993, 4, :o4, 733894260
-          tz.transition 1993, 10, :o3, 752034660
-          tz.transition 1994, 4, :o4, 765343860
-          tz.transition 1994, 10, :o3, 783484260
-          tz.transition 1995, 4, :o4, 796793460
-          tz.transition 1995, 10, :o3, 814933860
-          tz.transition 1996, 4, :o4, 828847860
-          tz.transition 1996, 10, :o3, 846383460
-          tz.transition 1997, 4, :o4, 860297460
-          tz.transition 1997, 10, :o3, 877833060
-          tz.transition 1998, 4, :o4, 891747060
-          tz.transition 1998, 10, :o3, 909282660
-          tz.transition 1999, 4, :o4, 923196660
-          tz.transition 1999, 10, :o3, 941337060
-          tz.transition 2000, 4, :o4, 954646260
-          tz.transition 2000, 10, :o3, 972786660
-          tz.transition 2001, 4, :o4, 986095860
-          tz.transition 2001, 10, :o3, 1004236260
-          tz.transition 2002, 4, :o4, 1018150260
-          tz.transition 2002, 10, :o3, 1035685860
-          tz.transition 2003, 4, :o4, 1049599860
-          tz.transition 2003, 10, :o3, 1067135460
-          tz.transition 2004, 4, :o4, 1081049460
-          tz.transition 2004, 10, :o3, 1099189860
-          tz.transition 2005, 4, :o4, 1112499060
-          tz.transition 2005, 10, :o3, 1130639460
-          tz.transition 2006, 4, :o4, 1143948660
-          tz.transition 2006, 10, :o3, 1162089060
-          tz.transition 2007, 3, :o4, 1173583860
-          tz.transition 2007, 11, :o3, 1194143460
-          tz.transition 2008, 3, :o4, 1205033460
-          tz.transition 2008, 11, :o3, 1225593060
-          tz.transition 2009, 3, :o4, 1236483060
-          tz.transition 2009, 11, :o3, 1257042660
-          tz.transition 2010, 3, :o4, 1268537460
-          tz.transition 2010, 11, :o3, 1289097060
-          tz.transition 2011, 3, :o4, 1299987060
-          tz.transition 2011, 11, :o3, 1320546660
-          tz.transition 2012, 3, :o4, 1331436660
-          tz.transition 2012, 11, :o3, 1351996260
-          tz.transition 2013, 3, :o4, 1362886260
-          tz.transition 2013, 11, :o3, 1383445860
-          tz.transition 2014, 3, :o4, 1394335860
-          tz.transition 2014, 11, :o3, 1414895460
-          tz.transition 2015, 3, :o4, 1425785460
-          tz.transition 2015, 11, :o3, 1446345060
-          tz.transition 2016, 3, :o4, 1457839860
-          tz.transition 2016, 11, :o3, 1478399460
-          tz.transition 2017, 3, :o4, 1489289460
-          tz.transition 2017, 11, :o3, 1509849060
-          tz.transition 2018, 3, :o4, 1520739060
-          tz.transition 2018, 11, :o3, 1541298660
-          tz.transition 2019, 3, :o4, 1552188660
-          tz.transition 2019, 11, :o3, 1572748260
-          tz.transition 2020, 3, :o4, 1583638260
-          tz.transition 2020, 11, :o3, 1604197860
-          tz.transition 2021, 3, :o4, 1615692660
-          tz.transition 2021, 11, :o3, 1636252260
-          tz.transition 2022, 3, :o4, 1647142260
-          tz.transition 2022, 11, :o3, 1667701860
-          tz.transition 2023, 3, :o4, 1678591860
-          tz.transition 2023, 11, :o3, 1699151460
-          tz.transition 2024, 3, :o4, 1710041460
-          tz.transition 2024, 11, :o3, 1730601060
-          tz.transition 2025, 3, :o4, 1741491060
-          tz.transition 2025, 11, :o3, 1762050660
-          tz.transition 2026, 3, :o4, 1772940660
-          tz.transition 2026, 11, :o3, 1793500260
-          tz.transition 2027, 3, :o4, 1804995060
-          tz.transition 2027, 11, :o3, 1825554660
-          tz.transition 2028, 3, :o4, 1836444660
-          tz.transition 2028, 11, :o3, 1857004260
-          tz.transition 2029, 3, :o4, 1867894260
-          tz.transition 2029, 11, :o3, 1888453860
-          tz.transition 2030, 3, :o4, 1899343860
-          tz.transition 2030, 11, :o3, 1919903460
-          tz.transition 2031, 3, :o4, 1930793460
-          tz.transition 2031, 11, :o3, 1951353060
-          tz.transition 2032, 3, :o4, 1962847860
-          tz.transition 2032, 11, :o3, 1983407460
-          tz.transition 2033, 3, :o4, 1994297460
-          tz.transition 2033, 11, :o3, 2014857060
-          tz.transition 2034, 3, :o4, 2025747060
-          tz.transition 2034, 11, :o3, 2046306660
-          tz.transition 2035, 3, :o4, 2057196660
-          tz.transition 2035, 11, :o3, 2077756260
-          tz.transition 2036, 3, :o4, 2088646260
-          tz.transition 2036, 11, :o3, 2109205860
-          tz.transition 2037, 3, :o4, 2120095860
-          tz.transition 2037, 11, :o3, 2140655460
-          tz.transition 2038, 3, :o4, 3550315171, 1440
-          tz.transition 2038, 11, :o3, 3550657831, 1440
-          tz.transition 2039, 3, :o4, 3550839331, 1440
-          tz.transition 2039, 11, :o3, 3551181991, 1440
-          tz.transition 2040, 3, :o4, 3551363491, 1440
-          tz.transition 2040, 11, :o3, 3551706151, 1440
-          tz.transition 2041, 3, :o4, 3551887651, 1440
-          tz.transition 2041, 11, :o3, 3552230311, 1440
-          tz.transition 2042, 3, :o4, 3552411811, 1440
-          tz.transition 2042, 11, :o3, 3552754471, 1440
-          tz.transition 2043, 3, :o4, 3552935971, 1440
-          tz.transition 2043, 11, :o3, 3553278631, 1440
-          tz.transition 2044, 3, :o4, 3553470211, 1440
-          tz.transition 2044, 11, :o3, 3553812871, 1440
-          tz.transition 2045, 3, :o4, 3553994371, 1440
-          tz.transition 2045, 11, :o3, 3554337031, 1440
-          tz.transition 2046, 3, :o4, 3554518531, 1440
-          tz.transition 2046, 11, :o3, 3554861191, 1440
-          tz.transition 2047, 3, :o4, 3555042691, 1440
-          tz.transition 2047, 11, :o3, 3555385351, 1440
-          tz.transition 2048, 3, :o4, 3555566851, 1440
-          tz.transition 2048, 11, :o3, 3555909511, 1440
-          tz.transition 2049, 3, :o4, 3556101091, 1440
-          tz.transition 2049, 11, :o3, 3556443751, 1440
-          tz.transition 2050, 3, :o4, 3556625251, 1440
-          tz.transition 2050, 11, :o3, 3556967911, 1440
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Tijuana.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Tijuana.rb
deleted file mode 100644
index 423059da46..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Tijuana.rb
+++ /dev/null
@@ -1,196 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module America
-      module Tijuana
-        include TimezoneDefinition
-        
-        timezone 'America/Tijuana' do |tz|
-          tz.offset :o0, -28084, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -28800, 0, :PST
-          tz.offset :o3, -28800, 3600, :PDT
-          tz.offset :o4, -28800, 3600, :PWT
-          tz.offset :o5, -28800, 3600, :PPT
-          
-          tz.transition 1922, 1, :o1, 14538335, 6
-          tz.transition 1924, 1, :o2, 58170859, 24
-          tz.transition 1927, 6, :o1, 58201027, 24
-          tz.transition 1930, 11, :o2, 58231099, 24
-          tz.transition 1931, 4, :o3, 14558597, 6
-          tz.transition 1931, 9, :o2, 58238755, 24
-          tz.transition 1942, 4, :o4, 14582843, 6
-          tz.transition 1945, 8, :o5, 58360379, 24
-          tz.transition 1945, 11, :o2, 58362523, 24
-          tz.transition 1948, 4, :o3, 14595881, 6
-          tz.transition 1949, 1, :o2, 58390339, 24
-          tz.transition 1954, 4, :o3, 29218295, 12
-          tz.transition 1954, 9, :o2, 19480095, 8
-          tz.transition 1955, 4, :o3, 29222663, 12
-          tz.transition 1955, 9, :o2, 19483007, 8
-          tz.transition 1956, 4, :o3, 29227115, 12
-          tz.transition 1956, 9, :o2, 19485975, 8
-          tz.transition 1957, 4, :o3, 29231483, 12
-          tz.transition 1957, 9, :o2, 19488887, 8
-          tz.transition 1958, 4, :o3, 29235851, 12
-          tz.transition 1958, 9, :o2, 19491799, 8
-          tz.transition 1959, 4, :o3, 29240219, 12
-          tz.transition 1959, 9, :o2, 19494711, 8
-          tz.transition 1960, 4, :o3, 29244587, 12
-          tz.transition 1960, 9, :o2, 19497623, 8
-          tz.transition 1976, 4, :o3, 199274400
-          tz.transition 1976, 10, :o2, 215600400
-          tz.transition 1977, 4, :o3, 230724000
-          tz.transition 1977, 10, :o2, 247050000
-          tz.transition 1978, 4, :o3, 262778400
-          tz.transition 1978, 10, :o2, 278499600
-          tz.transition 1979, 4, :o3, 294228000
-          tz.transition 1979, 10, :o2, 309949200
-          tz.transition 1980, 4, :o3, 325677600
-          tz.transition 1980, 10, :o2, 341398800
-          tz.transition 1981, 4, :o3, 357127200
-          tz.transition 1981, 10, :o2, 372848400
-          tz.transition 1982, 4, :o3, 388576800
-          tz.transition 1982, 10, :o2, 404902800
-          tz.transition 1983, 4, :o3, 420026400
-          tz.transition 1983, 10, :o2, 436352400
-          tz.transition 1984, 4, :o3, 452080800
-          tz.transition 1984, 10, :o2, 467802000
-          tz.transition 1985, 4, :o3, 483530400
-          tz.transition 1985, 10, :o2, 499251600
-          tz.transition 1986, 4, :o3, 514980000
-          tz.transition 1986, 10, :o2, 530701200
-          tz.transition 1987, 4, :o3, 544615200
-          tz.transition 1987, 10, :o2, 562150800
-          tz.transition 1988, 4, :o3, 576064800
-          tz.transition 1988, 10, :o2, 594205200
-          tz.transition 1989, 4, :o3, 607514400
-          tz.transition 1989, 10, :o2, 625654800
-          tz.transition 1990, 4, :o3, 638964000
-          tz.transition 1990, 10, :o2, 657104400
-          tz.transition 1991, 4, :o3, 671018400
-          tz.transition 1991, 10, :o2, 688554000
-          tz.transition 1992, 4, :o3, 702468000
-          tz.transition 1992, 10, :o2, 720003600
-          tz.transition 1993, 4, :o3, 733917600
-          tz.transition 1993, 10, :o2, 752058000
-          tz.transition 1994, 4, :o3, 765367200
-          tz.transition 1994, 10, :o2, 783507600
-          tz.transition 1995, 4, :o3, 796816800
-          tz.transition 1995, 10, :o2, 814957200
-          tz.transition 1996, 4, :o3, 828871200
-          tz.transition 1996, 10, :o2, 846406800
-          tz.transition 1997, 4, :o3, 860320800
-          tz.transition 1997, 10, :o2, 877856400
-          tz.transition 1998, 4, :o3, 891770400
-          tz.transition 1998, 10, :o2, 909306000
-          tz.transition 1999, 4, :o3, 923220000
-          tz.transition 1999, 10, :o2, 941360400
-          tz.transition 2000, 4, :o3, 954669600
-          tz.transition 2000, 10, :o2, 972810000
-          tz.transition 2001, 4, :o3, 986119200
-          tz.transition 2001, 10, :o2, 1004259600
-          tz.transition 2002, 4, :o3, 1018173600
-          tz.transition 2002, 10, :o2, 1035709200
-          tz.transition 2003, 4, :o3, 1049623200
-          tz.transition 2003, 10, :o2, 1067158800
-          tz.transition 2004, 4, :o3, 1081072800
-          tz.transition 2004, 10, :o2, 1099213200
-          tz.transition 2005, 4, :o3, 1112522400
-          tz.transition 2005, 10, :o2, 1130662800
-          tz.transition 2006, 4, :o3, 1143972000
-          tz.transition 2006, 10, :o2, 1162112400
-          tz.transition 2007, 4, :o3, 1175421600
-          tz.transition 2007, 10, :o2, 1193562000
-          tz.transition 2008, 4, :o3, 1207476000
-          tz.transition 2008, 10, :o2, 1225011600
-          tz.transition 2009, 4, :o3, 1238925600
-          tz.transition 2009, 10, :o2, 1256461200
-          tz.transition 2010, 4, :o3, 1270375200
-          tz.transition 2010, 10, :o2, 1288515600
-          tz.transition 2011, 4, :o3, 1301824800
-          tz.transition 2011, 10, :o2, 1319965200
-          tz.transition 2012, 4, :o3, 1333274400
-          tz.transition 2012, 10, :o2, 1351414800
-          tz.transition 2013, 4, :o3, 1365328800
-          tz.transition 2013, 10, :o2, 1382864400
-          tz.transition 2014, 4, :o3, 1396778400
-          tz.transition 2014, 10, :o2, 1414314000
-          tz.transition 2015, 4, :o3, 1428228000
-          tz.transition 2015, 10, :o2, 1445763600
-          tz.transition 2016, 4, :o3, 1459677600
-          tz.transition 2016, 10, :o2, 1477818000
-          tz.transition 2017, 4, :o3, 1491127200
-          tz.transition 2017, 10, :o2, 1509267600
-          tz.transition 2018, 4, :o3, 1522576800
-          tz.transition 2018, 10, :o2, 1540717200
-          tz.transition 2019, 4, :o3, 1554631200
-          tz.transition 2019, 10, :o2, 1572166800
-          tz.transition 2020, 4, :o3, 1586080800
-          tz.transition 2020, 10, :o2, 1603616400
-          tz.transition 2021, 4, :o3, 1617530400
-          tz.transition 2021, 10, :o2, 1635670800
-          tz.transition 2022, 4, :o3, 1648980000
-          tz.transition 2022, 10, :o2, 1667120400
-          tz.transition 2023, 4, :o3, 1680429600
-          tz.transition 2023, 10, :o2, 1698570000
-          tz.transition 2024, 4, :o3, 1712484000
-          tz.transition 2024, 10, :o2, 1730019600
-          tz.transition 2025, 4, :o3, 1743933600
-          tz.transition 2025, 10, :o2, 1761469200
-          tz.transition 2026, 4, :o3, 1775383200
-          tz.transition 2026, 10, :o2, 1792918800
-          tz.transition 2027, 4, :o3, 1806832800
-          tz.transition 2027, 10, :o2, 1824973200
-          tz.transition 2028, 4, :o3, 1838282400
-          tz.transition 2028, 10, :o2, 1856422800
-          tz.transition 2029, 4, :o3, 1869732000
-          tz.transition 2029, 10, :o2, 1887872400
-          tz.transition 2030, 4, :o3, 1901786400
-          tz.transition 2030, 10, :o2, 1919322000
-          tz.transition 2031, 4, :o3, 1933236000
-          tz.transition 2031, 10, :o2, 1950771600
-          tz.transition 2032, 4, :o3, 1964685600
-          tz.transition 2032, 10, :o2, 1982826000
-          tz.transition 2033, 4, :o3, 1996135200
-          tz.transition 2033, 10, :o2, 2014275600
-          tz.transition 2034, 4, :o3, 2027584800
-          tz.transition 2034, 10, :o2, 2045725200
-          tz.transition 2035, 4, :o3, 2059034400
-          tz.transition 2035, 10, :o2, 2077174800
-          tz.transition 2036, 4, :o3, 2091088800
-          tz.transition 2036, 10, :o2, 2108624400
-          tz.transition 2037, 4, :o3, 2122538400
-          tz.transition 2037, 10, :o2, 2140074000
-          tz.transition 2038, 4, :o3, 29586215, 12
-          tz.transition 2038, 10, :o2, 19725823, 8
-          tz.transition 2039, 4, :o3, 29590583, 12
-          tz.transition 2039, 10, :o2, 19728735, 8
-          tz.transition 2040, 4, :o3, 29594951, 12
-          tz.transition 2040, 10, :o2, 19731647, 8
-          tz.transition 2041, 4, :o3, 29599403, 12
-          tz.transition 2041, 10, :o2, 19734559, 8
-          tz.transition 2042, 4, :o3, 29603771, 12
-          tz.transition 2042, 10, :o2, 19737471, 8
-          tz.transition 2043, 4, :o3, 29608139, 12
-          tz.transition 2043, 10, :o2, 19740383, 8
-          tz.transition 2044, 4, :o3, 29612507, 12
-          tz.transition 2044, 10, :o2, 19743351, 8
-          tz.transition 2045, 4, :o3, 29616875, 12
-          tz.transition 2045, 10, :o2, 19746263, 8
-          tz.transition 2046, 4, :o3, 29621243, 12
-          tz.transition 2046, 10, :o2, 19749175, 8
-          tz.transition 2047, 4, :o3, 29625695, 12
-          tz.transition 2047, 10, :o2, 19752087, 8
-          tz.transition 2048, 4, :o3, 29630063, 12
-          tz.transition 2048, 10, :o2, 19754999, 8
-          tz.transition 2049, 4, :o3, 29634431, 12
-          tz.transition 2049, 10, :o2, 19757967, 8
-          tz.transition 2050, 4, :o3, 29638799, 12
-          tz.transition 2050, 10, :o2, 19760879, 8
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Almaty.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Almaty.rb
deleted file mode 100644
index 9ee18970f1..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Almaty.rb
+++ /dev/null
@@ -1,67 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Almaty
-        include TimezoneDefinition
-        
-        timezone 'Asia/Almaty' do |tz|
-          tz.offset :o0, 18468, 0, :LMT
-          tz.offset :o1, 18000, 0, :ALMT
-          tz.offset :o2, 21600, 0, :ALMT
-          tz.offset :o3, 21600, 3600, :ALMST
-          
-          tz.transition 1924, 5, :o1, 1939125829, 800
-          tz.transition 1930, 6, :o2, 58227559, 24
-          tz.transition 1981, 3, :o3, 354909600
-          tz.transition 1981, 9, :o2, 370717200
-          tz.transition 1982, 3, :o3, 386445600
-          tz.transition 1982, 9, :o2, 402253200
-          tz.transition 1983, 3, :o3, 417981600
-          tz.transition 1983, 9, :o2, 433789200
-          tz.transition 1984, 3, :o3, 449604000
-          tz.transition 1984, 9, :o2, 465336000
-          tz.transition 1985, 3, :o3, 481060800
-          tz.transition 1985, 9, :o2, 496785600
-          tz.transition 1986, 3, :o3, 512510400
-          tz.transition 1986, 9, :o2, 528235200
-          tz.transition 1987, 3, :o3, 543960000
-          tz.transition 1987, 9, :o2, 559684800
-          tz.transition 1988, 3, :o3, 575409600
-          tz.transition 1988, 9, :o2, 591134400
-          tz.transition 1989, 3, :o3, 606859200
-          tz.transition 1989, 9, :o2, 622584000
-          tz.transition 1990, 3, :o3, 638308800
-          tz.transition 1990, 9, :o2, 654638400
-          tz.transition 1992, 3, :o3, 701802000
-          tz.transition 1992, 9, :o2, 717523200
-          tz.transition 1993, 3, :o3, 733262400
-          tz.transition 1993, 9, :o2, 748987200
-          tz.transition 1994, 3, :o3, 764712000
-          tz.transition 1994, 9, :o2, 780436800
-          tz.transition 1995, 3, :o3, 796161600
-          tz.transition 1995, 9, :o2, 811886400
-          tz.transition 1996, 3, :o3, 828216000
-          tz.transition 1996, 10, :o2, 846360000
-          tz.transition 1997, 3, :o3, 859665600
-          tz.transition 1997, 10, :o2, 877809600
-          tz.transition 1998, 3, :o3, 891115200
-          tz.transition 1998, 10, :o2, 909259200
-          tz.transition 1999, 3, :o3, 922564800
-          tz.transition 1999, 10, :o2, 941313600
-          tz.transition 2000, 3, :o3, 954014400
-          tz.transition 2000, 10, :o2, 972763200
-          tz.transition 2001, 3, :o3, 985464000
-          tz.transition 2001, 10, :o2, 1004212800
-          tz.transition 2002, 3, :o3, 1017518400
-          tz.transition 2002, 10, :o2, 1035662400
-          tz.transition 2003, 3, :o3, 1048968000
-          tz.transition 2003, 10, :o2, 1067112000
-          tz.transition 2004, 3, :o3, 1080417600
-          tz.transition 2004, 10, :o2, 1099166400
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Baghdad.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Baghdad.rb
deleted file mode 100644
index 774dca1587..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Baghdad.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Baghdad
-        include TimezoneDefinition
-        
-        timezone 'Asia/Baghdad' do |tz|
-          tz.offset :o0, 10660, 0, :LMT
-          tz.offset :o1, 10656, 0, :BMT
-          tz.offset :o2, 10800, 0, :AST
-          tz.offset :o3, 10800, 3600, :ADT
-          
-          tz.transition 1889, 12, :o1, 10417111387, 4320
-          tz.transition 1917, 12, :o2, 726478313, 300
-          tz.transition 1982, 4, :o3, 389048400
-          tz.transition 1982, 9, :o2, 402264000
-          tz.transition 1983, 3, :o3, 417906000
-          tz.transition 1983, 9, :o2, 433800000
-          tz.transition 1984, 3, :o3, 449614800
-          tz.transition 1984, 9, :o2, 465422400
-          tz.transition 1985, 3, :o3, 481150800
-          tz.transition 1985, 9, :o2, 496792800
-          tz.transition 1986, 3, :o3, 512517600
-          tz.transition 1986, 9, :o2, 528242400
-          tz.transition 1987, 3, :o3, 543967200
-          tz.transition 1987, 9, :o2, 559692000
-          tz.transition 1988, 3, :o3, 575416800
-          tz.transition 1988, 9, :o2, 591141600
-          tz.transition 1989, 3, :o3, 606866400
-          tz.transition 1989, 9, :o2, 622591200
-          tz.transition 1990, 3, :o3, 638316000
-          tz.transition 1990, 9, :o2, 654645600
-          tz.transition 1991, 4, :o3, 670464000
-          tz.transition 1991, 10, :o2, 686275200
-          tz.transition 1992, 4, :o3, 702086400
-          tz.transition 1992, 10, :o2, 717897600
-          tz.transition 1993, 4, :o3, 733622400
-          tz.transition 1993, 10, :o2, 749433600
-          tz.transition 1994, 4, :o3, 765158400
-          tz.transition 1994, 10, :o2, 780969600
-          tz.transition 1995, 4, :o3, 796694400
-          tz.transition 1995, 10, :o2, 812505600
-          tz.transition 1996, 4, :o3, 828316800
-          tz.transition 1996, 10, :o2, 844128000
-          tz.transition 1997, 4, :o3, 859852800
-          tz.transition 1997, 10, :o2, 875664000
-          tz.transition 1998, 4, :o3, 891388800
-          tz.transition 1998, 10, :o2, 907200000
-          tz.transition 1999, 4, :o3, 922924800
-          tz.transition 1999, 10, :o2, 938736000
-          tz.transition 2000, 4, :o3, 954547200
-          tz.transition 2000, 10, :o2, 970358400
-          tz.transition 2001, 4, :o3, 986083200
-          tz.transition 2001, 10, :o2, 1001894400
-          tz.transition 2002, 4, :o3, 1017619200
-          tz.transition 2002, 10, :o2, 1033430400
-          tz.transition 2003, 4, :o3, 1049155200
-          tz.transition 2003, 10, :o2, 1064966400
-          tz.transition 2004, 4, :o3, 1080777600
-          tz.transition 2004, 10, :o2, 1096588800
-          tz.transition 2005, 4, :o3, 1112313600
-          tz.transition 2005, 10, :o2, 1128124800
-          tz.transition 2006, 4, :o3, 1143849600
-          tz.transition 2006, 10, :o2, 1159660800
-          tz.transition 2007, 4, :o3, 1175385600
-          tz.transition 2007, 10, :o2, 1191196800
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Baku.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Baku.rb
deleted file mode 100644
index e86340ebfa..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Baku.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Baku
-        include TimezoneDefinition
-        
-        timezone 'Asia/Baku' do |tz|
-          tz.offset :o0, 11964, 0, :LMT
-          tz.offset :o1, 10800, 0, :BAKT
-          tz.offset :o2, 14400, 0, :BAKT
-          tz.offset :o3, 14400, 3600, :BAKST
-          tz.offset :o4, 10800, 3600, :BAKST
-          tz.offset :o5, 10800, 3600, :AZST
-          tz.offset :o6, 10800, 0, :AZT
-          tz.offset :o7, 14400, 0, :AZT
-          tz.offset :o8, 14400, 3600, :AZST
-          
-          tz.transition 1924, 5, :o1, 17452133003, 7200
-          tz.transition 1957, 2, :o2, 19487187, 8
-          tz.transition 1981, 3, :o3, 354916800
-          tz.transition 1981, 9, :o2, 370724400
-          tz.transition 1982, 3, :o3, 386452800
-          tz.transition 1982, 9, :o2, 402260400
-          tz.transition 1983, 3, :o3, 417988800
-          tz.transition 1983, 9, :o2, 433796400
-          tz.transition 1984, 3, :o3, 449611200
-          tz.transition 1984, 9, :o2, 465343200
-          tz.transition 1985, 3, :o3, 481068000
-          tz.transition 1985, 9, :o2, 496792800
-          tz.transition 1986, 3, :o3, 512517600
-          tz.transition 1986, 9, :o2, 528242400
-          tz.transition 1987, 3, :o3, 543967200
-          tz.transition 1987, 9, :o2, 559692000
-          tz.transition 1988, 3, :o3, 575416800
-          tz.transition 1988, 9, :o2, 591141600
-          tz.transition 1989, 3, :o3, 606866400
-          tz.transition 1989, 9, :o2, 622591200
-          tz.transition 1990, 3, :o3, 638316000
-          tz.transition 1990, 9, :o2, 654645600
-          tz.transition 1991, 3, :o4, 670370400
-          tz.transition 1991, 8, :o5, 683496000
-          tz.transition 1991, 9, :o6, 686098800
-          tz.transition 1992, 3, :o5, 701812800
-          tz.transition 1992, 9, :o7, 717534000
-          tz.transition 1996, 3, :o8, 828234000
-          tz.transition 1996, 10, :o7, 846378000
-          tz.transition 1997, 3, :o8, 859680000
-          tz.transition 1997, 10, :o7, 877824000
-          tz.transition 1998, 3, :o8, 891129600
-          tz.transition 1998, 10, :o7, 909273600
-          tz.transition 1999, 3, :o8, 922579200
-          tz.transition 1999, 10, :o7, 941328000
-          tz.transition 2000, 3, :o8, 954028800
-          tz.transition 2000, 10, :o7, 972777600
-          tz.transition 2001, 3, :o8, 985478400
-          tz.transition 2001, 10, :o7, 1004227200
-          tz.transition 2002, 3, :o8, 1017532800
-          tz.transition 2002, 10, :o7, 1035676800
-          tz.transition 2003, 3, :o8, 1048982400
-          tz.transition 2003, 10, :o7, 1067126400
-          tz.transition 2004, 3, :o8, 1080432000
-          tz.transition 2004, 10, :o7, 1099180800
-          tz.transition 2005, 3, :o8, 1111881600
-          tz.transition 2005, 10, :o7, 1130630400
-          tz.transition 2006, 3, :o8, 1143331200
-          tz.transition 2006, 10, :o7, 1162080000
-          tz.transition 2007, 3, :o8, 1174780800
-          tz.transition 2007, 10, :o7, 1193529600
-          tz.transition 2008, 3, :o8, 1206835200
-          tz.transition 2008, 10, :o7, 1224979200
-          tz.transition 2009, 3, :o8, 1238284800
-          tz.transition 2009, 10, :o7, 1256428800
-          tz.transition 2010, 3, :o8, 1269734400
-          tz.transition 2010, 10, :o7, 1288483200
-          tz.transition 2011, 3, :o8, 1301184000
-          tz.transition 2011, 10, :o7, 1319932800
-          tz.transition 2012, 3, :o8, 1332633600
-          tz.transition 2012, 10, :o7, 1351382400
-          tz.transition 2013, 3, :o8, 1364688000
-          tz.transition 2013, 10, :o7, 1382832000
-          tz.transition 2014, 3, :o8, 1396137600
-          tz.transition 2014, 10, :o7, 1414281600
-          tz.transition 2015, 3, :o8, 1427587200
-          tz.transition 2015, 10, :o7, 1445731200
-          tz.transition 2016, 3, :o8, 1459036800
-          tz.transition 2016, 10, :o7, 1477785600
-          tz.transition 2017, 3, :o8, 1490486400
-          tz.transition 2017, 10, :o7, 1509235200
-          tz.transition 2018, 3, :o8, 1521936000
-          tz.transition 2018, 10, :o7, 1540684800
-          tz.transition 2019, 3, :o8, 1553990400
-          tz.transition 2019, 10, :o7, 1572134400
-          tz.transition 2020, 3, :o8, 1585440000
-          tz.transition 2020, 10, :o7, 1603584000
-          tz.transition 2021, 3, :o8, 1616889600
-          tz.transition 2021, 10, :o7, 1635638400
-          tz.transition 2022, 3, :o8, 1648339200
-          tz.transition 2022, 10, :o7, 1667088000
-          tz.transition 2023, 3, :o8, 1679788800
-          tz.transition 2023, 10, :o7, 1698537600
-          tz.transition 2024, 3, :o8, 1711843200
-          tz.transition 2024, 10, :o7, 1729987200
-          tz.transition 2025, 3, :o8, 1743292800
-          tz.transition 2025, 10, :o7, 1761436800
-          tz.transition 2026, 3, :o8, 1774742400
-          tz.transition 2026, 10, :o7, 1792886400
-          tz.transition 2027, 3, :o8, 1806192000
-          tz.transition 2027, 10, :o7, 1824940800
-          tz.transition 2028, 3, :o8, 1837641600
-          tz.transition 2028, 10, :o7, 1856390400
-          tz.transition 2029, 3, :o8, 1869091200
-          tz.transition 2029, 10, :o7, 1887840000
-          tz.transition 2030, 3, :o8, 1901145600
-          tz.transition 2030, 10, :o7, 1919289600
-          tz.transition 2031, 3, :o8, 1932595200
-          tz.transition 2031, 10, :o7, 1950739200
-          tz.transition 2032, 3, :o8, 1964044800
-          tz.transition 2032, 10, :o7, 1982793600
-          tz.transition 2033, 3, :o8, 1995494400
-          tz.transition 2033, 10, :o7, 2014243200
-          tz.transition 2034, 3, :o8, 2026944000
-          tz.transition 2034, 10, :o7, 2045692800
-          tz.transition 2035, 3, :o8, 2058393600
-          tz.transition 2035, 10, :o7, 2077142400
-          tz.transition 2036, 3, :o8, 2090448000
-          tz.transition 2036, 10, :o7, 2108592000
-          tz.transition 2037, 3, :o8, 2121897600
-          tz.transition 2037, 10, :o7, 2140041600
-          tz.transition 2038, 3, :o8, 4931021, 2
-          tz.transition 2038, 10, :o7, 4931455, 2
-          tz.transition 2039, 3, :o8, 4931749, 2
-          tz.transition 2039, 10, :o7, 4932183, 2
-          tz.transition 2040, 3, :o8, 4932477, 2
-          tz.transition 2040, 10, :o7, 4932911, 2
-          tz.transition 2041, 3, :o8, 4933219, 2
-          tz.transition 2041, 10, :o7, 4933639, 2
-          tz.transition 2042, 3, :o8, 4933947, 2
-          tz.transition 2042, 10, :o7, 4934367, 2
-          tz.transition 2043, 3, :o8, 4934675, 2
-          tz.transition 2043, 10, :o7, 4935095, 2
-          tz.transition 2044, 3, :o8, 4935403, 2
-          tz.transition 2044, 10, :o7, 4935837, 2
-          tz.transition 2045, 3, :o8, 4936131, 2
-          tz.transition 2045, 10, :o7, 4936565, 2
-          tz.transition 2046, 3, :o8, 4936859, 2
-          tz.transition 2046, 10, :o7, 4937293, 2
-          tz.transition 2047, 3, :o8, 4937601, 2
-          tz.transition 2047, 10, :o7, 4938021, 2
-          tz.transition 2048, 3, :o8, 4938329, 2
-          tz.transition 2048, 10, :o7, 4938749, 2
-          tz.transition 2049, 3, :o8, 4939057, 2
-          tz.transition 2049, 10, :o7, 4939491, 2
-          tz.transition 2050, 3, :o8, 4939785, 2
-          tz.transition 2050, 10, :o7, 4940219, 2
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Bangkok.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Bangkok.rb
deleted file mode 100644
index 139194e5e5..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Bangkok.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Bangkok
-        include TimezoneDefinition
-        
-        timezone 'Asia/Bangkok' do |tz|
-          tz.offset :o0, 24124, 0, :LMT
-          tz.offset :o1, 24124, 0, :BMT
-          tz.offset :o2, 25200, 0, :ICT
-          
-          tz.transition 1879, 12, :o1, 52006648769, 21600
-          tz.transition 1920, 3, :o2, 52324168769, 21600
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Chongqing.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Chongqing.rb
deleted file mode 100644
index 8c94b4ba86..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Chongqing.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Chongqing
-        include TimezoneDefinition
-        
-        timezone 'Asia/Chongqing' do |tz|
-          tz.offset :o0, 25580, 0, :LMT
-          tz.offset :o1, 25200, 0, :LONT
-          tz.offset :o2, 28800, 0, :CST
-          tz.offset :o3, 28800, 3600, :CDT
-          
-          tz.transition 1927, 12, :o1, 10477063601, 4320
-          tz.transition 1980, 4, :o2, 325962000
-          tz.transition 1986, 5, :o3, 515520000
-          tz.transition 1986, 9, :o2, 527007600
-          tz.transition 1987, 4, :o3, 545155200
-          tz.transition 1987, 9, :o2, 558457200
-          tz.transition 1988, 4, :o3, 576604800
-          tz.transition 1988, 9, :o2, 589906800
-          tz.transition 1989, 4, :o3, 608659200
-          tz.transition 1989, 9, :o2, 621961200
-          tz.transition 1990, 4, :o3, 640108800
-          tz.transition 1990, 9, :o2, 653410800
-          tz.transition 1991, 4, :o3, 671558400
-          tz.transition 1991, 9, :o2, 684860400
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Colombo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Colombo.rb
deleted file mode 100644
index f6531fa819..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Colombo.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Colombo
-        include TimezoneDefinition
-        
-        timezone 'Asia/Colombo' do |tz|
-          tz.offset :o0, 19164, 0, :LMT
-          tz.offset :o1, 19172, 0, :MMT
-          tz.offset :o2, 19800, 0, :IST
-          tz.offset :o3, 19800, 1800, :IHST
-          tz.offset :o4, 19800, 3600, :IST
-          tz.offset :o5, 23400, 0, :LKT
-          tz.offset :o6, 21600, 0, :LKT
-          
-          tz.transition 1879, 12, :o1, 17335550003, 7200
-          tz.transition 1905, 12, :o2, 52211763607, 21600
-          tz.transition 1942, 1, :o3, 116657485, 48
-          tz.transition 1942, 8, :o4, 9722413, 4
-          tz.transition 1945, 10, :o2, 38907909, 16
-          tz.transition 1996, 5, :o5, 832962600
-          tz.transition 1996, 10, :o6, 846266400
-          tz.transition 2006, 4, :o2, 1145039400
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Dhaka.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Dhaka.rb
deleted file mode 100644
index 46dce9a0d0..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Dhaka.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Dhaka
-        include TimezoneDefinition
-        
-        timezone 'Asia/Dhaka' do |tz|
-          tz.offset :o0, 21700, 0, :LMT
-          tz.offset :o1, 21200, 0, :HMT
-          tz.offset :o2, 23400, 0, :BURT
-          tz.offset :o3, 19800, 0, :IST
-          tz.offset :o4, 21600, 0, :DACT
-          tz.offset :o5, 21600, 0, :BDT
-          tz.offset :o6, 21600, 3600, :BDST
-          
-          tz.transition 1889, 12, :o1, 2083422167, 864
-          tz.transition 1941, 9, :o2, 524937943, 216
-          tz.transition 1942, 5, :o3, 116663723, 48
-          tz.transition 1942, 8, :o2, 116668957, 48
-          tz.transition 1951, 9, :o4, 116828123, 48
-          tz.transition 1971, 3, :o5, 38772000
-          tz.transition 2009, 6, :o6, 1245430800
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Hong_Kong.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Hong_Kong.rb
deleted file mode 100644
index f1edd75ac8..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Hong_Kong.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Hong_Kong
-        include TimezoneDefinition
-        
-        timezone 'Asia/Hong_Kong' do |tz|
-          tz.offset :o0, 27396, 0, :LMT
-          tz.offset :o1, 28800, 0, :HKT
-          tz.offset :o2, 28800, 3600, :HKST
-          
-          tz.transition 1904, 10, :o1, 5800279639, 2400
-          tz.transition 1946, 4, :o2, 38910885, 16
-          tz.transition 1946, 11, :o1, 116743453, 48
-          tz.transition 1947, 4, :o2, 38916613, 16
-          tz.transition 1947, 12, :o1, 116762365, 48
-          tz.transition 1948, 5, :o2, 38922773, 16
-          tz.transition 1948, 10, :o1, 116777053, 48
-          tz.transition 1949, 4, :o2, 38928149, 16
-          tz.transition 1949, 10, :o1, 116794525, 48
-          tz.transition 1950, 4, :o2, 38933973, 16
-          tz.transition 1950, 10, :o1, 116811997, 48
-          tz.transition 1951, 3, :o2, 38939797, 16
-          tz.transition 1951, 10, :o1, 116829469, 48
-          tz.transition 1952, 4, :o2, 38945733, 16
-          tz.transition 1952, 10, :o1, 116846941, 48
-          tz.transition 1953, 4, :o2, 38951557, 16
-          tz.transition 1953, 10, :o1, 116864749, 48
-          tz.transition 1954, 3, :o2, 38957157, 16
-          tz.transition 1954, 10, :o1, 116882221, 48
-          tz.transition 1955, 3, :o2, 38962981, 16
-          tz.transition 1955, 11, :o1, 116900029, 48
-          tz.transition 1956, 3, :o2, 38968805, 16
-          tz.transition 1956, 11, :o1, 116917501, 48
-          tz.transition 1957, 3, :o2, 38974741, 16
-          tz.transition 1957, 11, :o1, 116934973, 48
-          tz.transition 1958, 3, :o2, 38980565, 16
-          tz.transition 1958, 11, :o1, 116952445, 48
-          tz.transition 1959, 3, :o2, 38986389, 16
-          tz.transition 1959, 10, :o1, 116969917, 48
-          tz.transition 1960, 3, :o2, 38992213, 16
-          tz.transition 1960, 11, :o1, 116987725, 48
-          tz.transition 1961, 3, :o2, 38998037, 16
-          tz.transition 1961, 11, :o1, 117005197, 48
-          tz.transition 1962, 3, :o2, 39003861, 16
-          tz.transition 1962, 11, :o1, 117022669, 48
-          tz.transition 1963, 3, :o2, 39009797, 16
-          tz.transition 1963, 11, :o1, 117040141, 48
-          tz.transition 1964, 3, :o2, 39015621, 16
-          tz.transition 1964, 10, :o1, 117057613, 48
-          tz.transition 1965, 4, :o2, 39021893, 16
-          tz.transition 1965, 10, :o1, 117074413, 48
-          tz.transition 1966, 4, :o2, 39027717, 16
-          tz.transition 1966, 10, :o1, 117091885, 48
-          tz.transition 1967, 4, :o2, 39033541, 16
-          tz.transition 1967, 10, :o1, 117109693, 48
-          tz.transition 1968, 4, :o2, 39039477, 16
-          tz.transition 1968, 10, :o1, 117127165, 48
-          tz.transition 1969, 4, :o2, 39045301, 16
-          tz.transition 1969, 10, :o1, 117144637, 48
-          tz.transition 1970, 4, :o2, 9315000
-          tz.transition 1970, 10, :o1, 25036200
-          tz.transition 1971, 4, :o2, 40764600
-          tz.transition 1971, 10, :o1, 56485800
-          tz.transition 1972, 4, :o2, 72214200
-          tz.transition 1972, 10, :o1, 88540200
-          tz.transition 1973, 4, :o2, 104268600
-          tz.transition 1973, 10, :o1, 119989800
-          tz.transition 1974, 4, :o2, 135718200
-          tz.transition 1974, 10, :o1, 151439400
-          tz.transition 1975, 4, :o2, 167167800
-          tz.transition 1975, 10, :o1, 182889000
-          tz.transition 1976, 4, :o2, 198617400
-          tz.transition 1976, 10, :o1, 214338600
-          tz.transition 1977, 4, :o2, 230067000
-          tz.transition 1977, 10, :o1, 245788200
-          tz.transition 1979, 5, :o2, 295385400
-          tz.transition 1979, 10, :o1, 309292200
-          tz.transition 1980, 5, :o2, 326835000
-          tz.transition 1980, 10, :o1, 340741800
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Irkutsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Irkutsk.rb
deleted file mode 100644
index 2d47d9580b..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Irkutsk.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Irkutsk
-        include TimezoneDefinition
-        
-        timezone 'Asia/Irkutsk' do |tz|
-          tz.offset :o0, 25040, 0, :LMT
-          tz.offset :o1, 25040, 0, :IMT
-          tz.offset :o2, 25200, 0, :IRKT
-          tz.offset :o3, 28800, 0, :IRKT
-          tz.offset :o4, 28800, 3600, :IRKST
-          tz.offset :o5, 25200, 3600, :IRKST
-          
-          tz.transition 1879, 12, :o1, 2600332427, 1080
-          tz.transition 1920, 1, :o2, 2616136067, 1080
-          tz.transition 1930, 6, :o3, 58227557, 24
-          tz.transition 1981, 3, :o4, 354902400
-          tz.transition 1981, 9, :o3, 370710000
-          tz.transition 1982, 3, :o4, 386438400
-          tz.transition 1982, 9, :o3, 402246000
-          tz.transition 1983, 3, :o4, 417974400
-          tz.transition 1983, 9, :o3, 433782000
-          tz.transition 1984, 3, :o4, 449596800
-          tz.transition 1984, 9, :o3, 465328800
-          tz.transition 1985, 3, :o4, 481053600
-          tz.transition 1985, 9, :o3, 496778400
-          tz.transition 1986, 3, :o4, 512503200
-          tz.transition 1986, 9, :o3, 528228000
-          tz.transition 1987, 3, :o4, 543952800
-          tz.transition 1987, 9, :o3, 559677600
-          tz.transition 1988, 3, :o4, 575402400
-          tz.transition 1988, 9, :o3, 591127200
-          tz.transition 1989, 3, :o4, 606852000
-          tz.transition 1989, 9, :o3, 622576800
-          tz.transition 1990, 3, :o4, 638301600
-          tz.transition 1990, 9, :o3, 654631200
-          tz.transition 1991, 3, :o5, 670356000
-          tz.transition 1991, 9, :o2, 686084400
-          tz.transition 1992, 1, :o3, 695761200
-          tz.transition 1992, 3, :o4, 701794800
-          tz.transition 1992, 9, :o3, 717516000
-          tz.transition 1993, 3, :o4, 733255200
-          tz.transition 1993, 9, :o3, 748980000
-          tz.transition 1994, 3, :o4, 764704800
-          tz.transition 1994, 9, :o3, 780429600
-          tz.transition 1995, 3, :o4, 796154400
-          tz.transition 1995, 9, :o3, 811879200
-          tz.transition 1996, 3, :o4, 828208800
-          tz.transition 1996, 10, :o3, 846352800
-          tz.transition 1997, 3, :o4, 859658400
-          tz.transition 1997, 10, :o3, 877802400
-          tz.transition 1998, 3, :o4, 891108000
-          tz.transition 1998, 10, :o3, 909252000
-          tz.transition 1999, 3, :o4, 922557600
-          tz.transition 1999, 10, :o3, 941306400
-          tz.transition 2000, 3, :o4, 954007200
-          tz.transition 2000, 10, :o3, 972756000
-          tz.transition 2001, 3, :o4, 985456800
-          tz.transition 2001, 10, :o3, 1004205600
-          tz.transition 2002, 3, :o4, 1017511200
-          tz.transition 2002, 10, :o3, 1035655200
-          tz.transition 2003, 3, :o4, 1048960800
-          tz.transition 2003, 10, :o3, 1067104800
-          tz.transition 2004, 3, :o4, 1080410400
-          tz.transition 2004, 10, :o3, 1099159200
-          tz.transition 2005, 3, :o4, 1111860000
-          tz.transition 2005, 10, :o3, 1130608800
-          tz.transition 2006, 3, :o4, 1143309600
-          tz.transition 2006, 10, :o3, 1162058400
-          tz.transition 2007, 3, :o4, 1174759200
-          tz.transition 2007, 10, :o3, 1193508000
-          tz.transition 2008, 3, :o4, 1206813600
-          tz.transition 2008, 10, :o3, 1224957600
-          tz.transition 2009, 3, :o4, 1238263200
-          tz.transition 2009, 10, :o3, 1256407200
-          tz.transition 2010, 3, :o4, 1269712800
-          tz.transition 2010, 10, :o3, 1288461600
-          tz.transition 2011, 3, :o4, 1301162400
-          tz.transition 2011, 10, :o3, 1319911200
-          tz.transition 2012, 3, :o4, 1332612000
-          tz.transition 2012, 10, :o3, 1351360800
-          tz.transition 2013, 3, :o4, 1364666400
-          tz.transition 2013, 10, :o3, 1382810400
-          tz.transition 2014, 3, :o4, 1396116000
-          tz.transition 2014, 10, :o3, 1414260000
-          tz.transition 2015, 3, :o4, 1427565600
-          tz.transition 2015, 10, :o3, 1445709600
-          tz.transition 2016, 3, :o4, 1459015200
-          tz.transition 2016, 10, :o3, 1477764000
-          tz.transition 2017, 3, :o4, 1490464800
-          tz.transition 2017, 10, :o3, 1509213600
-          tz.transition 2018, 3, :o4, 1521914400
-          tz.transition 2018, 10, :o3, 1540663200
-          tz.transition 2019, 3, :o4, 1553968800
-          tz.transition 2019, 10, :o3, 1572112800
-          tz.transition 2020, 3, :o4, 1585418400
-          tz.transition 2020, 10, :o3, 1603562400
-          tz.transition 2021, 3, :o4, 1616868000
-          tz.transition 2021, 10, :o3, 1635616800
-          tz.transition 2022, 3, :o4, 1648317600
-          tz.transition 2022, 10, :o3, 1667066400
-          tz.transition 2023, 3, :o4, 1679767200
-          tz.transition 2023, 10, :o3, 1698516000
-          tz.transition 2024, 3, :o4, 1711821600
-          tz.transition 2024, 10, :o3, 1729965600
-          tz.transition 2025, 3, :o4, 1743271200
-          tz.transition 2025, 10, :o3, 1761415200
-          tz.transition 2026, 3, :o4, 1774720800
-          tz.transition 2026, 10, :o3, 1792864800
-          tz.transition 2027, 3, :o4, 1806170400
-          tz.transition 2027, 10, :o3, 1824919200
-          tz.transition 2028, 3, :o4, 1837620000
-          tz.transition 2028, 10, :o3, 1856368800
-          tz.transition 2029, 3, :o4, 1869069600
-          tz.transition 2029, 10, :o3, 1887818400
-          tz.transition 2030, 3, :o4, 1901124000
-          tz.transition 2030, 10, :o3, 1919268000
-          tz.transition 2031, 3, :o4, 1932573600
-          tz.transition 2031, 10, :o3, 1950717600
-          tz.transition 2032, 3, :o4, 1964023200
-          tz.transition 2032, 10, :o3, 1982772000
-          tz.transition 2033, 3, :o4, 1995472800
-          tz.transition 2033, 10, :o3, 2014221600
-          tz.transition 2034, 3, :o4, 2026922400
-          tz.transition 2034, 10, :o3, 2045671200
-          tz.transition 2035, 3, :o4, 2058372000
-          tz.transition 2035, 10, :o3, 2077120800
-          tz.transition 2036, 3, :o4, 2090426400
-          tz.transition 2036, 10, :o3, 2108570400
-          tz.transition 2037, 3, :o4, 2121876000
-          tz.transition 2037, 10, :o3, 2140020000
-          tz.transition 2038, 3, :o4, 9862041, 4
-          tz.transition 2038, 10, :o3, 9862909, 4
-          tz.transition 2039, 3, :o4, 9863497, 4
-          tz.transition 2039, 10, :o3, 9864365, 4
-          tz.transition 2040, 3, :o4, 9864953, 4
-          tz.transition 2040, 10, :o3, 9865821, 4
-          tz.transition 2041, 3, :o4, 9866437, 4
-          tz.transition 2041, 10, :o3, 9867277, 4
-          tz.transition 2042, 3, :o4, 9867893, 4
-          tz.transition 2042, 10, :o3, 9868733, 4
-          tz.transition 2043, 3, :o4, 9869349, 4
-          tz.transition 2043, 10, :o3, 9870189, 4
-          tz.transition 2044, 3, :o4, 9870805, 4
-          tz.transition 2044, 10, :o3, 9871673, 4
-          tz.transition 2045, 3, :o4, 9872261, 4
-          tz.transition 2045, 10, :o3, 9873129, 4
-          tz.transition 2046, 3, :o4, 9873717, 4
-          tz.transition 2046, 10, :o3, 9874585, 4
-          tz.transition 2047, 3, :o4, 9875201, 4
-          tz.transition 2047, 10, :o3, 9876041, 4
-          tz.transition 2048, 3, :o4, 9876657, 4
-          tz.transition 2048, 10, :o3, 9877497, 4
-          tz.transition 2049, 3, :o4, 9878113, 4
-          tz.transition 2049, 10, :o3, 9878981, 4
-          tz.transition 2050, 3, :o4, 9879569, 4
-          tz.transition 2050, 10, :o3, 9880437, 4
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Jakarta.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Jakarta.rb
deleted file mode 100644
index cc58fa173b..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Jakarta.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Jakarta
-        include TimezoneDefinition
-        
-        timezone 'Asia/Jakarta' do |tz|
-          tz.offset :o0, 25632, 0, :LMT
-          tz.offset :o1, 25632, 0, :JMT
-          tz.offset :o2, 26400, 0, :JAVT
-          tz.offset :o3, 27000, 0, :WIT
-          tz.offset :o4, 32400, 0, :JST
-          tz.offset :o5, 28800, 0, :WIT
-          tz.offset :o6, 25200, 0, :WIT
-          
-          tz.transition 1867, 8, :o1, 720956461, 300
-          tz.transition 1923, 12, :o2, 87256267, 36
-          tz.transition 1932, 10, :o3, 87372439, 36
-          tz.transition 1942, 3, :o4, 38887059, 16
-          tz.transition 1945, 9, :o3, 19453769, 8
-          tz.transition 1948, 4, :o5, 38922755, 16
-          tz.transition 1950, 4, :o3, 14600413, 6
-          tz.transition 1963, 12, :o6, 39014323, 16
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Jerusalem.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Jerusalem.rb
deleted file mode 100644
index 9b737b899e..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Jerusalem.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Jerusalem
-        include TimezoneDefinition
-        
-        timezone 'Asia/Jerusalem' do |tz|
-          tz.offset :o0, 8456, 0, :LMT
-          tz.offset :o1, 8440, 0, :JMT
-          tz.offset :o2, 7200, 0, :IST
-          tz.offset :o3, 7200, 3600, :IDT
-          tz.offset :o4, 7200, 7200, :IDDT
-          
-          tz.transition 1879, 12, :o1, 26003326343, 10800
-          tz.transition 1917, 12, :o2, 5230643909, 2160
-          tz.transition 1940, 5, :o3, 29157377, 12
-          tz.transition 1942, 10, :o2, 19445315, 8
-          tz.transition 1943, 4, :o3, 4861631, 2
-          tz.transition 1943, 10, :o2, 19448235, 8
-          tz.transition 1944, 3, :o3, 29174177, 12
-          tz.transition 1944, 10, :o2, 19451163, 8
-          tz.transition 1945, 4, :o3, 29178737, 12
-          tz.transition 1945, 10, :o2, 58362251, 24
-          tz.transition 1946, 4, :o3, 4863853, 2
-          tz.transition 1946, 10, :o2, 19457003, 8
-          tz.transition 1948, 5, :o4, 29192333, 12
-          tz.transition 1948, 8, :o3, 7298386, 3
-          tz.transition 1948, 10, :o2, 58388555, 24
-          tz.transition 1949, 4, :o3, 29196449, 12
-          tz.transition 1949, 10, :o2, 58397315, 24
-          tz.transition 1950, 4, :o3, 29200649, 12
-          tz.transition 1950, 9, :o2, 4867079, 2
-          tz.transition 1951, 3, :o3, 29204849, 12
-          tz.transition 1951, 11, :o2, 4867923, 2
-          tz.transition 1952, 4, :o3, 4868245, 2
-          tz.transition 1952, 10, :o2, 4868609, 2
-          tz.transition 1953, 4, :o3, 4868959, 2
-          tz.transition 1953, 9, :o2, 4869267, 2
-          tz.transition 1954, 6, :o3, 29218877, 12
-          tz.transition 1954, 9, :o2, 19479979, 8
-          tz.transition 1955, 6, :o3, 4870539, 2
-          tz.transition 1955, 9, :o2, 19482891, 8
-          tz.transition 1956, 6, :o3, 29227529, 12
-          tz.transition 1956, 9, :o2, 4871493, 2
-          tz.transition 1957, 4, :o3, 4871915, 2
-          tz.transition 1957, 9, :o2, 19488827, 8
-          tz.transition 1974, 7, :o3, 142380000
-          tz.transition 1974, 10, :o2, 150843600
-          tz.transition 1975, 4, :o3, 167176800
-          tz.transition 1975, 8, :o2, 178664400
-          tz.transition 1985, 4, :o3, 482277600
-          tz.transition 1985, 9, :o2, 495579600
-          tz.transition 1986, 5, :o3, 516751200
-          tz.transition 1986, 9, :o2, 526424400
-          tz.transition 1987, 4, :o3, 545436000
-          tz.transition 1987, 9, :o2, 558478800
-          tz.transition 1988, 4, :o3, 576540000
-          tz.transition 1988, 9, :o2, 589237200
-          tz.transition 1989, 4, :o3, 609890400
-          tz.transition 1989, 9, :o2, 620773200
-          tz.transition 1990, 3, :o3, 638316000
-          tz.transition 1990, 8, :o2, 651618000
-          tz.transition 1991, 3, :o3, 669765600
-          tz.transition 1991, 8, :o2, 683672400
-          tz.transition 1992, 3, :o3, 701820000
-          tz.transition 1992, 9, :o2, 715726800
-          tz.transition 1993, 4, :o3, 733701600
-          tz.transition 1993, 9, :o2, 747176400
-          tz.transition 1994, 3, :o3, 765151200
-          tz.transition 1994, 8, :o2, 778021200
-          tz.transition 1995, 3, :o3, 796600800
-          tz.transition 1995, 9, :o2, 810075600
-          tz.transition 1996, 3, :o3, 826840800
-          tz.transition 1996, 9, :o2, 842821200
-          tz.transition 1997, 3, :o3, 858895200
-          tz.transition 1997, 9, :o2, 874184400
-          tz.transition 1998, 3, :o3, 890344800
-          tz.transition 1998, 9, :o2, 905029200
-          tz.transition 1999, 4, :o3, 923011200
-          tz.transition 1999, 9, :o2, 936313200
-          tz.transition 2000, 4, :o3, 955670400
-          tz.transition 2000, 10, :o2, 970783200
-          tz.transition 2001, 4, :o3, 986770800
-          tz.transition 2001, 9, :o2, 1001282400
-          tz.transition 2002, 3, :o3, 1017356400
-          tz.transition 2002, 10, :o2, 1033941600
-          tz.transition 2003, 3, :o3, 1048806000
-          tz.transition 2003, 10, :o2, 1065132000
-          tz.transition 2004, 4, :o3, 1081292400
-          tz.transition 2004, 9, :o2, 1095804000
-          tz.transition 2005, 4, :o3, 1112313600
-          tz.transition 2005, 10, :o2, 1128812400
-          tz.transition 2006, 3, :o3, 1143763200
-          tz.transition 2006, 9, :o2, 1159657200
-          tz.transition 2007, 3, :o3, 1175212800
-          tz.transition 2007, 9, :o2, 1189897200
-          tz.transition 2008, 3, :o3, 1206662400
-          tz.transition 2008, 10, :o2, 1223161200
-          tz.transition 2009, 3, :o3, 1238112000
-          tz.transition 2009, 9, :o2, 1254006000
-          tz.transition 2010, 3, :o3, 1269561600
-          tz.transition 2010, 9, :o2, 1284246000
-          tz.transition 2011, 4, :o3, 1301616000
-          tz.transition 2011, 10, :o2, 1317510000
-          tz.transition 2012, 3, :o3, 1333065600
-          tz.transition 2012, 9, :o2, 1348354800
-          tz.transition 2013, 3, :o3, 1364515200
-          tz.transition 2013, 9, :o2, 1378594800
-          tz.transition 2014, 3, :o3, 1395964800
-          tz.transition 2014, 9, :o2, 1411858800
-          tz.transition 2015, 3, :o3, 1427414400
-          tz.transition 2015, 9, :o2, 1442703600
-          tz.transition 2016, 4, :o3, 1459468800
-          tz.transition 2016, 10, :o2, 1475967600
-          tz.transition 2017, 3, :o3, 1490918400
-          tz.transition 2017, 9, :o2, 1506207600
-          tz.transition 2018, 3, :o3, 1522368000
-          tz.transition 2018, 9, :o2, 1537052400
-          tz.transition 2019, 3, :o3, 1553817600
-          tz.transition 2019, 10, :o2, 1570316400
-          tz.transition 2020, 3, :o3, 1585267200
-          tz.transition 2020, 9, :o2, 1601161200
-          tz.transition 2021, 3, :o3, 1616716800
-          tz.transition 2021, 9, :o2, 1631401200
-          tz.transition 2022, 4, :o3, 1648771200
-          tz.transition 2022, 10, :o2, 1664665200
-          tz.transition 2023, 3, :o3, 1680220800
-          tz.transition 2023, 9, :o2, 1695510000
-          tz.transition 2024, 3, :o3, 1711670400
-          tz.transition 2024, 10, :o2, 1728169200
-          tz.transition 2025, 3, :o3, 1743120000
-          tz.transition 2025, 9, :o2, 1759014000
-          tz.transition 2026, 3, :o3, 1774569600
-          tz.transition 2026, 9, :o2, 1789858800
-          tz.transition 2027, 3, :o3, 1806019200
-          tz.transition 2027, 10, :o2, 1823122800
-          tz.transition 2028, 3, :o3, 1838073600
-          tz.transition 2028, 9, :o2, 1853362800
-          tz.transition 2029, 3, :o3, 1869523200
-          tz.transition 2029, 9, :o2, 1884207600
-          tz.transition 2030, 3, :o3, 1900972800
-          tz.transition 2030, 10, :o2, 1917471600
-          tz.transition 2031, 3, :o3, 1932422400
-          tz.transition 2031, 9, :o2, 1947711600
-          tz.transition 2032, 3, :o3, 1963872000
-          tz.transition 2032, 9, :o2, 1978556400
-          tz.transition 2033, 4, :o3, 1995926400
-          tz.transition 2033, 10, :o2, 2011820400
-          tz.transition 2034, 3, :o3, 2027376000
-          tz.transition 2034, 9, :o2, 2042060400
-          tz.transition 2035, 3, :o3, 2058825600
-          tz.transition 2035, 10, :o2, 2075324400
-          tz.transition 2036, 3, :o3, 2090275200
-          tz.transition 2036, 9, :o2, 2106169200
-          tz.transition 2037, 3, :o3, 2121724800
-          tz.transition 2037, 9, :o2, 2136409200
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kabul.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kabul.rb
deleted file mode 100644
index 669c09790a..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kabul.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Kabul
-        include TimezoneDefinition
-        
-        timezone 'Asia/Kabul' do |tz|
-          tz.offset :o0, 16608, 0, :LMT
-          tz.offset :o1, 14400, 0, :AFT
-          tz.offset :o2, 16200, 0, :AFT
-          
-          tz.transition 1889, 12, :o1, 2170231477, 900
-          tz.transition 1944, 12, :o2, 7294369, 3
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kamchatka.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kamchatka.rb
deleted file mode 100644
index 2f1690b3a9..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kamchatka.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Kamchatka
-        include TimezoneDefinition
-        
-        timezone 'Asia/Kamchatka' do |tz|
-          tz.offset :o0, 38076, 0, :LMT
-          tz.offset :o1, 39600, 0, :PETT
-          tz.offset :o2, 43200, 0, :PETT
-          tz.offset :o3, 43200, 3600, :PETST
-          tz.offset :o4, 39600, 3600, :PETST
-          
-          tz.transition 1922, 11, :o1, 17448250027, 7200
-          tz.transition 1930, 6, :o2, 58227553, 24
-          tz.transition 1981, 3, :o3, 354888000
-          tz.transition 1981, 9, :o2, 370695600
-          tz.transition 1982, 3, :o3, 386424000
-          tz.transition 1982, 9, :o2, 402231600
-          tz.transition 1983, 3, :o3, 417960000
-          tz.transition 1983, 9, :o2, 433767600
-          tz.transition 1984, 3, :o3, 449582400
-          tz.transition 1984, 9, :o2, 465314400
-          tz.transition 1985, 3, :o3, 481039200
-          tz.transition 1985, 9, :o2, 496764000
-          tz.transition 1986, 3, :o3, 512488800
-          tz.transition 1986, 9, :o2, 528213600
-          tz.transition 1987, 3, :o3, 543938400
-          tz.transition 1987, 9, :o2, 559663200
-          tz.transition 1988, 3, :o3, 575388000
-          tz.transition 1988, 9, :o2, 591112800
-          tz.transition 1989, 3, :o3, 606837600
-          tz.transition 1989, 9, :o2, 622562400
-          tz.transition 1990, 3, :o3, 638287200
-          tz.transition 1990, 9, :o2, 654616800
-          tz.transition 1991, 3, :o4, 670341600
-          tz.transition 1991, 9, :o1, 686070000
-          tz.transition 1992, 1, :o2, 695746800
-          tz.transition 1992, 3, :o3, 701780400
-          tz.transition 1992, 9, :o2, 717501600
-          tz.transition 1993, 3, :o3, 733240800
-          tz.transition 1993, 9, :o2, 748965600
-          tz.transition 1994, 3, :o3, 764690400
-          tz.transition 1994, 9, :o2, 780415200
-          tz.transition 1995, 3, :o3, 796140000
-          tz.transition 1995, 9, :o2, 811864800
-          tz.transition 1996, 3, :o3, 828194400
-          tz.transition 1996, 10, :o2, 846338400
-          tz.transition 1997, 3, :o3, 859644000
-          tz.transition 1997, 10, :o2, 877788000
-          tz.transition 1998, 3, :o3, 891093600
-          tz.transition 1998, 10, :o2, 909237600
-          tz.transition 1999, 3, :o3, 922543200
-          tz.transition 1999, 10, :o2, 941292000
-          tz.transition 2000, 3, :o3, 953992800
-          tz.transition 2000, 10, :o2, 972741600
-          tz.transition 2001, 3, :o3, 985442400
-          tz.transition 2001, 10, :o2, 1004191200
-          tz.transition 2002, 3, :o3, 1017496800
-          tz.transition 2002, 10, :o2, 1035640800
-          tz.transition 2003, 3, :o3, 1048946400
-          tz.transition 2003, 10, :o2, 1067090400
-          tz.transition 2004, 3, :o3, 1080396000
-          tz.transition 2004, 10, :o2, 1099144800
-          tz.transition 2005, 3, :o3, 1111845600
-          tz.transition 2005, 10, :o2, 1130594400
-          tz.transition 2006, 3, :o3, 1143295200
-          tz.transition 2006, 10, :o2, 1162044000
-          tz.transition 2007, 3, :o3, 1174744800
-          tz.transition 2007, 10, :o2, 1193493600
-          tz.transition 2008, 3, :o3, 1206799200
-          tz.transition 2008, 10, :o2, 1224943200
-          tz.transition 2009, 3, :o3, 1238248800
-          tz.transition 2009, 10, :o2, 1256392800
-          tz.transition 2010, 3, :o3, 1269698400
-          tz.transition 2010, 10, :o2, 1288447200
-          tz.transition 2011, 3, :o3, 1301148000
-          tz.transition 2011, 10, :o2, 1319896800
-          tz.transition 2012, 3, :o3, 1332597600
-          tz.transition 2012, 10, :o2, 1351346400
-          tz.transition 2013, 3, :o3, 1364652000
-          tz.transition 2013, 10, :o2, 1382796000
-          tz.transition 2014, 3, :o3, 1396101600
-          tz.transition 2014, 10, :o2, 1414245600
-          tz.transition 2015, 3, :o3, 1427551200
-          tz.transition 2015, 10, :o2, 1445695200
-          tz.transition 2016, 3, :o3, 1459000800
-          tz.transition 2016, 10, :o2, 1477749600
-          tz.transition 2017, 3, :o3, 1490450400
-          tz.transition 2017, 10, :o2, 1509199200
-          tz.transition 2018, 3, :o3, 1521900000
-          tz.transition 2018, 10, :o2, 1540648800
-          tz.transition 2019, 3, :o3, 1553954400
-          tz.transition 2019, 10, :o2, 1572098400
-          tz.transition 2020, 3, :o3, 1585404000
-          tz.transition 2020, 10, :o2, 1603548000
-          tz.transition 2021, 3, :o3, 1616853600
-          tz.transition 2021, 10, :o2, 1635602400
-          tz.transition 2022, 3, :o3, 1648303200
-          tz.transition 2022, 10, :o2, 1667052000
-          tz.transition 2023, 3, :o3, 1679752800
-          tz.transition 2023, 10, :o2, 1698501600
-          tz.transition 2024, 3, :o3, 1711807200
-          tz.transition 2024, 10, :o2, 1729951200
-          tz.transition 2025, 3, :o3, 1743256800
-          tz.transition 2025, 10, :o2, 1761400800
-          tz.transition 2026, 3, :o3, 1774706400
-          tz.transition 2026, 10, :o2, 1792850400
-          tz.transition 2027, 3, :o3, 1806156000
-          tz.transition 2027, 10, :o2, 1824904800
-          tz.transition 2028, 3, :o3, 1837605600
-          tz.transition 2028, 10, :o2, 1856354400
-          tz.transition 2029, 3, :o3, 1869055200
-          tz.transition 2029, 10, :o2, 1887804000
-          tz.transition 2030, 3, :o3, 1901109600
-          tz.transition 2030, 10, :o2, 1919253600
-          tz.transition 2031, 3, :o3, 1932559200
-          tz.transition 2031, 10, :o2, 1950703200
-          tz.transition 2032, 3, :o3, 1964008800
-          tz.transition 2032, 10, :o2, 1982757600
-          tz.transition 2033, 3, :o3, 1995458400
-          tz.transition 2033, 10, :o2, 2014207200
-          tz.transition 2034, 3, :o3, 2026908000
-          tz.transition 2034, 10, :o2, 2045656800
-          tz.transition 2035, 3, :o3, 2058357600
-          tz.transition 2035, 10, :o2, 2077106400
-          tz.transition 2036, 3, :o3, 2090412000
-          tz.transition 2036, 10, :o2, 2108556000
-          tz.transition 2037, 3, :o3, 2121861600
-          tz.transition 2037, 10, :o2, 2140005600
-          tz.transition 2038, 3, :o3, 29586121, 12
-          tz.transition 2038, 10, :o2, 29588725, 12
-          tz.transition 2039, 3, :o3, 29590489, 12
-          tz.transition 2039, 10, :o2, 29593093, 12
-          tz.transition 2040, 3, :o3, 29594857, 12
-          tz.transition 2040, 10, :o2, 29597461, 12
-          tz.transition 2041, 3, :o3, 29599309, 12
-          tz.transition 2041, 10, :o2, 29601829, 12
-          tz.transition 2042, 3, :o3, 29603677, 12
-          tz.transition 2042, 10, :o2, 29606197, 12
-          tz.transition 2043, 3, :o3, 29608045, 12
-          tz.transition 2043, 10, :o2, 29610565, 12
-          tz.transition 2044, 3, :o3, 29612413, 12
-          tz.transition 2044, 10, :o2, 29615017, 12
-          tz.transition 2045, 3, :o3, 29616781, 12
-          tz.transition 2045, 10, :o2, 29619385, 12
-          tz.transition 2046, 3, :o3, 29621149, 12
-          tz.transition 2046, 10, :o2, 29623753, 12
-          tz.transition 2047, 3, :o3, 29625601, 12
-          tz.transition 2047, 10, :o2, 29628121, 12
-          tz.transition 2048, 3, :o3, 29629969, 12
-          tz.transition 2048, 10, :o2, 29632489, 12
-          tz.transition 2049, 3, :o3, 29634337, 12
-          tz.transition 2049, 10, :o2, 29636941, 12
-          tz.transition 2050, 3, :o3, 29638705, 12
-          tz.transition 2050, 10, :o2, 29641309, 12
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Karachi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Karachi.rb
deleted file mode 100644
index dfe02c5cf6..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Karachi.rb
+++ /dev/null
@@ -1,114 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Karachi
-        include TimezoneDefinition
-        
-        timezone 'Asia/Karachi' do |tz|
-          tz.offset :o0, 16092, 0, :LMT
-          tz.offset :o1, 19800, 0, :IST
-          tz.offset :o2, 19800, 3600, :IST
-          tz.offset :o3, 18000, 0, :KART
-          tz.offset :o4, 18000, 0, :PKT
-          tz.offset :o5, 18000, 3600, :PKST
-          
-          tz.transition 1906, 12, :o1, 1934061051, 800
-          tz.transition 1942, 8, :o2, 116668957, 48
-          tz.transition 1945, 10, :o1, 116723675, 48
-          tz.transition 1951, 9, :o3, 116828125, 48
-          tz.transition 1971, 3, :o4, 38775600
-          tz.transition 2002, 4, :o5, 1018119660
-          tz.transition 2002, 10, :o4, 1033840860
-          tz.transition 2008, 5, :o5, 1212260400
-          tz.transition 2008, 10, :o4, 1225476000
-          tz.transition 2009, 4, :o5, 1239735600
-          tz.transition 2009, 10, :o4, 1257012000
-          tz.transition 2010, 4, :o5, 1271271600
-          tz.transition 2010, 10, :o4, 1288548000
-          tz.transition 2011, 4, :o5, 1302807600
-          tz.transition 2011, 10, :o4, 1320084000
-          tz.transition 2012, 4, :o5, 1334430000
-          tz.transition 2012, 10, :o4, 1351706400
-          tz.transition 2013, 4, :o5, 1365966000
-          tz.transition 2013, 10, :o4, 1383242400
-          tz.transition 2014, 4, :o5, 1397502000
-          tz.transition 2014, 10, :o4, 1414778400
-          tz.transition 2015, 4, :o5, 1429038000
-          tz.transition 2015, 10, :o4, 1446314400
-          tz.transition 2016, 4, :o5, 1460660400
-          tz.transition 2016, 10, :o4, 1477936800
-          tz.transition 2017, 4, :o5, 1492196400
-          tz.transition 2017, 10, :o4, 1509472800
-          tz.transition 2018, 4, :o5, 1523732400
-          tz.transition 2018, 10, :o4, 1541008800
-          tz.transition 2019, 4, :o5, 1555268400
-          tz.transition 2019, 10, :o4, 1572544800
-          tz.transition 2020, 4, :o5, 1586890800
-          tz.transition 2020, 10, :o4, 1604167200
-          tz.transition 2021, 4, :o5, 1618426800
-          tz.transition 2021, 10, :o4, 1635703200
-          tz.transition 2022, 4, :o5, 1649962800
-          tz.transition 2022, 10, :o4, 1667239200
-          tz.transition 2023, 4, :o5, 1681498800
-          tz.transition 2023, 10, :o4, 1698775200
-          tz.transition 2024, 4, :o5, 1713121200
-          tz.transition 2024, 10, :o4, 1730397600
-          tz.transition 2025, 4, :o5, 1744657200
-          tz.transition 2025, 10, :o4, 1761933600
-          tz.transition 2026, 4, :o5, 1776193200
-          tz.transition 2026, 10, :o4, 1793469600
-          tz.transition 2027, 4, :o5, 1807729200
-          tz.transition 2027, 10, :o4, 1825005600
-          tz.transition 2028, 4, :o5, 1839351600
-          tz.transition 2028, 10, :o4, 1856628000
-          tz.transition 2029, 4, :o5, 1870887600
-          tz.transition 2029, 10, :o4, 1888164000
-          tz.transition 2030, 4, :o5, 1902423600
-          tz.transition 2030, 10, :o4, 1919700000
-          tz.transition 2031, 4, :o5, 1933959600
-          tz.transition 2031, 10, :o4, 1951236000
-          tz.transition 2032, 4, :o5, 1965582000
-          tz.transition 2032, 10, :o4, 1982858400
-          tz.transition 2033, 4, :o5, 1997118000
-          tz.transition 2033, 10, :o4, 2014394400
-          tz.transition 2034, 4, :o5, 2028654000
-          tz.transition 2034, 10, :o4, 2045930400
-          tz.transition 2035, 4, :o5, 2060190000
-          tz.transition 2035, 10, :o4, 2077466400
-          tz.transition 2036, 4, :o5, 2091812400
-          tz.transition 2036, 10, :o4, 2109088800
-          tz.transition 2037, 4, :o5, 2123348400
-          tz.transition 2037, 10, :o4, 2140624800
-          tz.transition 2038, 4, :o5, 59172679, 24
-          tz.transition 2038, 10, :o4, 9862913, 4
-          tz.transition 2039, 4, :o5, 59181439, 24
-          tz.transition 2039, 10, :o4, 9864373, 4
-          tz.transition 2040, 4, :o5, 59190223, 24
-          tz.transition 2040, 10, :o4, 9865837, 4
-          tz.transition 2041, 4, :o5, 59198983, 24
-          tz.transition 2041, 10, :o4, 9867297, 4
-          tz.transition 2042, 4, :o5, 59207743, 24
-          tz.transition 2042, 10, :o4, 9868757, 4
-          tz.transition 2043, 4, :o5, 59216503, 24
-          tz.transition 2043, 10, :o4, 9870217, 4
-          tz.transition 2044, 4, :o5, 59225287, 24
-          tz.transition 2044, 10, :o4, 9871681, 4
-          tz.transition 2045, 4, :o5, 59234047, 24
-          tz.transition 2045, 10, :o4, 9873141, 4
-          tz.transition 2046, 4, :o5, 59242807, 24
-          tz.transition 2046, 10, :o4, 9874601, 4
-          tz.transition 2047, 4, :o5, 59251567, 24
-          tz.transition 2047, 10, :o4, 9876061, 4
-          tz.transition 2048, 4, :o5, 59260351, 24
-          tz.transition 2048, 10, :o4, 9877525, 4
-          tz.transition 2049, 4, :o5, 59269111, 24
-          tz.transition 2049, 10, :o4, 9878985, 4
-          tz.transition 2050, 4, :o5, 59277871, 24
-          tz.transition 2050, 10, :o4, 9880445, 4
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kathmandu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kathmandu.rb
deleted file mode 100644
index 37b241612e..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kathmandu.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Kathmandu
-        include TimezoneDefinition
-        
-        timezone 'Asia/Kathmandu' do |tz|
-          tz.offset :o0, 20476, 0, :LMT
-          tz.offset :o1, 19800, 0, :IST
-          tz.offset :o2, 20700, 0, :NPT
-          
-          tz.transition 1919, 12, :o1, 52322204081, 21600
-          tz.transition 1985, 12, :o2, 504901800
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kolkata.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kolkata.rb
deleted file mode 100644
index 1b6ffbd59d..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kolkata.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Kolkata
-        include TimezoneDefinition
-        
-        timezone 'Asia/Kolkata' do |tz|
-          tz.offset :o0, 21208, 0, :LMT
-          tz.offset :o1, 21200, 0, :HMT
-          tz.offset :o2, 23400, 0, :BURT
-          tz.offset :o3, 19800, 0, :IST
-          tz.offset :o4, 19800, 3600, :IST
-          
-          tz.transition 1879, 12, :o1, 26003324749, 10800
-          tz.transition 1941, 9, :o2, 524937943, 216
-          tz.transition 1942, 5, :o3, 116663723, 48
-          tz.transition 1942, 8, :o4, 116668957, 48
-          tz.transition 1945, 10, :o3, 116723675, 48
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb
deleted file mode 100644
index d6c503c155..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Krasnoyarsk
-        include TimezoneDefinition
-        
-        timezone 'Asia/Krasnoyarsk' do |tz|
-          tz.offset :o0, 22280, 0, :LMT
-          tz.offset :o1, 21600, 0, :KRAT
-          tz.offset :o2, 25200, 0, :KRAT
-          tz.offset :o3, 25200, 3600, :KRAST
-          tz.offset :o4, 21600, 3600, :KRAST
-          
-          tz.transition 1920, 1, :o1, 5232231163, 2160
-          tz.transition 1930, 6, :o2, 9704593, 4
-          tz.transition 1981, 3, :o3, 354906000
-          tz.transition 1981, 9, :o2, 370713600
-          tz.transition 1982, 3, :o3, 386442000
-          tz.transition 1982, 9, :o2, 402249600
-          tz.transition 1983, 3, :o3, 417978000
-          tz.transition 1983, 9, :o2, 433785600
-          tz.transition 1984, 3, :o3, 449600400
-          tz.transition 1984, 9, :o2, 465332400
-          tz.transition 1985, 3, :o3, 481057200
-          tz.transition 1985, 9, :o2, 496782000
-          tz.transition 1986, 3, :o3, 512506800
-          tz.transition 1986, 9, :o2, 528231600
-          tz.transition 1987, 3, :o3, 543956400
-          tz.transition 1987, 9, :o2, 559681200
-          tz.transition 1988, 3, :o3, 575406000
-          tz.transition 1988, 9, :o2, 591130800
-          tz.transition 1989, 3, :o3, 606855600
-          tz.transition 1989, 9, :o2, 622580400
-          tz.transition 1990, 3, :o3, 638305200
-          tz.transition 1990, 9, :o2, 654634800
-          tz.transition 1991, 3, :o4, 670359600
-          tz.transition 1991, 9, :o1, 686088000
-          tz.transition 1992, 1, :o2, 695764800
-          tz.transition 1992, 3, :o3, 701798400
-          tz.transition 1992, 9, :o2, 717519600
-          tz.transition 1993, 3, :o3, 733258800
-          tz.transition 1993, 9, :o2, 748983600
-          tz.transition 1994, 3, :o3, 764708400
-          tz.transition 1994, 9, :o2, 780433200
-          tz.transition 1995, 3, :o3, 796158000
-          tz.transition 1995, 9, :o2, 811882800
-          tz.transition 1996, 3, :o3, 828212400
-          tz.transition 1996, 10, :o2, 846356400
-          tz.transition 1997, 3, :o3, 859662000
-          tz.transition 1997, 10, :o2, 877806000
-          tz.transition 1998, 3, :o3, 891111600
-          tz.transition 1998, 10, :o2, 909255600
-          tz.transition 1999, 3, :o3, 922561200
-          tz.transition 1999, 10, :o2, 941310000
-          tz.transition 2000, 3, :o3, 954010800
-          tz.transition 2000, 10, :o2, 972759600
-          tz.transition 2001, 3, :o3, 985460400
-          tz.transition 2001, 10, :o2, 1004209200
-          tz.transition 2002, 3, :o3, 1017514800
-          tz.transition 2002, 10, :o2, 1035658800
-          tz.transition 2003, 3, :o3, 1048964400
-          tz.transition 2003, 10, :o2, 1067108400
-          tz.transition 2004, 3, :o3, 1080414000
-          tz.transition 2004, 10, :o2, 1099162800
-          tz.transition 2005, 3, :o3, 1111863600
-          tz.transition 2005, 10, :o2, 1130612400
-          tz.transition 2006, 3, :o3, 1143313200
-          tz.transition 2006, 10, :o2, 1162062000
-          tz.transition 2007, 3, :o3, 1174762800
-          tz.transition 2007, 10, :o2, 1193511600
-          tz.transition 2008, 3, :o3, 1206817200
-          tz.transition 2008, 10, :o2, 1224961200
-          tz.transition 2009, 3, :o3, 1238266800
-          tz.transition 2009, 10, :o2, 1256410800
-          tz.transition 2010, 3, :o3, 1269716400
-          tz.transition 2010, 10, :o2, 1288465200
-          tz.transition 2011, 3, :o3, 1301166000
-          tz.transition 2011, 10, :o2, 1319914800
-          tz.transition 2012, 3, :o3, 1332615600
-          tz.transition 2012, 10, :o2, 1351364400
-          tz.transition 2013, 3, :o3, 1364670000
-          tz.transition 2013, 10, :o2, 1382814000
-          tz.transition 2014, 3, :o3, 1396119600
-          tz.transition 2014, 10, :o2, 1414263600
-          tz.transition 2015, 3, :o3, 1427569200
-          tz.transition 2015, 10, :o2, 1445713200
-          tz.transition 2016, 3, :o3, 1459018800
-          tz.transition 2016, 10, :o2, 1477767600
-          tz.transition 2017, 3, :o3, 1490468400
-          tz.transition 2017, 10, :o2, 1509217200
-          tz.transition 2018, 3, :o3, 1521918000
-          tz.transition 2018, 10, :o2, 1540666800
-          tz.transition 2019, 3, :o3, 1553972400
-          tz.transition 2019, 10, :o2, 1572116400
-          tz.transition 2020, 3, :o3, 1585422000
-          tz.transition 2020, 10, :o2, 1603566000
-          tz.transition 2021, 3, :o3, 1616871600
-          tz.transition 2021, 10, :o2, 1635620400
-          tz.transition 2022, 3, :o3, 1648321200
-          tz.transition 2022, 10, :o2, 1667070000
-          tz.transition 2023, 3, :o3, 1679770800
-          tz.transition 2023, 10, :o2, 1698519600
-          tz.transition 2024, 3, :o3, 1711825200
-          tz.transition 2024, 10, :o2, 1729969200
-          tz.transition 2025, 3, :o3, 1743274800
-          tz.transition 2025, 10, :o2, 1761418800
-          tz.transition 2026, 3, :o3, 1774724400
-          tz.transition 2026, 10, :o2, 1792868400
-          tz.transition 2027, 3, :o3, 1806174000
-          tz.transition 2027, 10, :o2, 1824922800
-          tz.transition 2028, 3, :o3, 1837623600
-          tz.transition 2028, 10, :o2, 1856372400
-          tz.transition 2029, 3, :o3, 1869073200
-          tz.transition 2029, 10, :o2, 1887822000
-          tz.transition 2030, 3, :o3, 1901127600
-          tz.transition 2030, 10, :o2, 1919271600
-          tz.transition 2031, 3, :o3, 1932577200
-          tz.transition 2031, 10, :o2, 1950721200
-          tz.transition 2032, 3, :o3, 1964026800
-          tz.transition 2032, 10, :o2, 1982775600
-          tz.transition 2033, 3, :o3, 1995476400
-          tz.transition 2033, 10, :o2, 2014225200
-          tz.transition 2034, 3, :o3, 2026926000
-          tz.transition 2034, 10, :o2, 2045674800
-          tz.transition 2035, 3, :o3, 2058375600
-          tz.transition 2035, 10, :o2, 2077124400
-          tz.transition 2036, 3, :o3, 2090430000
-          tz.transition 2036, 10, :o2, 2108574000
-          tz.transition 2037, 3, :o3, 2121879600
-          tz.transition 2037, 10, :o2, 2140023600
-          tz.transition 2038, 3, :o3, 59172247, 24
-          tz.transition 2038, 10, :o2, 59177455, 24
-          tz.transition 2039, 3, :o3, 59180983, 24
-          tz.transition 2039, 10, :o2, 59186191, 24
-          tz.transition 2040, 3, :o3, 59189719, 24
-          tz.transition 2040, 10, :o2, 59194927, 24
-          tz.transition 2041, 3, :o3, 59198623, 24
-          tz.transition 2041, 10, :o2, 59203663, 24
-          tz.transition 2042, 3, :o3, 59207359, 24
-          tz.transition 2042, 10, :o2, 59212399, 24
-          tz.transition 2043, 3, :o3, 59216095, 24
-          tz.transition 2043, 10, :o2, 59221135, 24
-          tz.transition 2044, 3, :o3, 59224831, 24
-          tz.transition 2044, 10, :o2, 59230039, 24
-          tz.transition 2045, 3, :o3, 59233567, 24
-          tz.transition 2045, 10, :o2, 59238775, 24
-          tz.transition 2046, 3, :o3, 59242303, 24
-          tz.transition 2046, 10, :o2, 59247511, 24
-          tz.transition 2047, 3, :o3, 59251207, 24
-          tz.transition 2047, 10, :o2, 59256247, 24
-          tz.transition 2048, 3, :o3, 59259943, 24
-          tz.transition 2048, 10, :o2, 59264983, 24
-          tz.transition 2049, 3, :o3, 59268679, 24
-          tz.transition 2049, 10, :o2, 59273887, 24
-          tz.transition 2050, 3, :o3, 59277415, 24
-          tz.transition 2050, 10, :o2, 59282623, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb
deleted file mode 100644
index 77a0c206fa..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Kuala_Lumpur
-        include TimezoneDefinition
-        
-        timezone 'Asia/Kuala_Lumpur' do |tz|
-          tz.offset :o0, 24406, 0, :LMT
-          tz.offset :o1, 24925, 0, :SMT
-          tz.offset :o2, 25200, 0, :MALT
-          tz.offset :o3, 25200, 1200, :MALST
-          tz.offset :o4, 26400, 0, :MALT
-          tz.offset :o5, 27000, 0, :MALT
-          tz.offset :o6, 32400, 0, :JST
-          tz.offset :o7, 28800, 0, :MYT
-          
-          tz.transition 1900, 12, :o1, 104344641397, 43200
-          tz.transition 1905, 5, :o2, 8353142363, 3456
-          tz.transition 1932, 12, :o3, 58249757, 24
-          tz.transition 1935, 12, :o4, 87414055, 36
-          tz.transition 1941, 8, :o5, 87488575, 36
-          tz.transition 1942, 2, :o6, 38886499, 16
-          tz.transition 1945, 9, :o5, 19453681, 8
-          tz.transition 1981, 12, :o7, 378664200
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kuwait.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kuwait.rb
deleted file mode 100644
index 5bd5283197..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kuwait.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Kuwait
-        include TimezoneDefinition
-        
-        timezone 'Asia/Kuwait' do |tz|
-          tz.offset :o0, 11516, 0, :LMT
-          tz.offset :o1, 10800, 0, :AST
-          
-          tz.transition 1949, 12, :o1, 52558899121, 21600
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Magadan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Magadan.rb
deleted file mode 100644
index 302093693e..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Magadan.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Magadan
-        include TimezoneDefinition
-        
-        timezone 'Asia/Magadan' do |tz|
-          tz.offset :o0, 36192, 0, :LMT
-          tz.offset :o1, 36000, 0, :MAGT
-          tz.offset :o2, 39600, 0, :MAGT
-          tz.offset :o3, 39600, 3600, :MAGST
-          tz.offset :o4, 36000, 3600, :MAGST
-          
-          tz.transition 1924, 5, :o1, 2181516373, 900
-          tz.transition 1930, 6, :o2, 29113777, 12
-          tz.transition 1981, 3, :o3, 354891600
-          tz.transition 1981, 9, :o2, 370699200
-          tz.transition 1982, 3, :o3, 386427600
-          tz.transition 1982, 9, :o2, 402235200
-          tz.transition 1983, 3, :o3, 417963600
-          tz.transition 1983, 9, :o2, 433771200
-          tz.transition 1984, 3, :o3, 449586000
-          tz.transition 1984, 9, :o2, 465318000
-          tz.transition 1985, 3, :o3, 481042800
-          tz.transition 1985, 9, :o2, 496767600
-          tz.transition 1986, 3, :o3, 512492400
-          tz.transition 1986, 9, :o2, 528217200
-          tz.transition 1987, 3, :o3, 543942000
-          tz.transition 1987, 9, :o2, 559666800
-          tz.transition 1988, 3, :o3, 575391600
-          tz.transition 1988, 9, :o2, 591116400
-          tz.transition 1989, 3, :o3, 606841200
-          tz.transition 1989, 9, :o2, 622566000
-          tz.transition 1990, 3, :o3, 638290800
-          tz.transition 1990, 9, :o2, 654620400
-          tz.transition 1991, 3, :o4, 670345200
-          tz.transition 1991, 9, :o1, 686073600
-          tz.transition 1992, 1, :o2, 695750400
-          tz.transition 1992, 3, :o3, 701784000
-          tz.transition 1992, 9, :o2, 717505200
-          tz.transition 1993, 3, :o3, 733244400
-          tz.transition 1993, 9, :o2, 748969200
-          tz.transition 1994, 3, :o3, 764694000
-          tz.transition 1994, 9, :o2, 780418800
-          tz.transition 1995, 3, :o3, 796143600
-          tz.transition 1995, 9, :o2, 811868400
-          tz.transition 1996, 3, :o3, 828198000
-          tz.transition 1996, 10, :o2, 846342000
-          tz.transition 1997, 3, :o3, 859647600
-          tz.transition 1997, 10, :o2, 877791600
-          tz.transition 1998, 3, :o3, 891097200
-          tz.transition 1998, 10, :o2, 909241200
-          tz.transition 1999, 3, :o3, 922546800
-          tz.transition 1999, 10, :o2, 941295600
-          tz.transition 2000, 3, :o3, 953996400
-          tz.transition 2000, 10, :o2, 972745200
-          tz.transition 2001, 3, :o3, 985446000
-          tz.transition 2001, 10, :o2, 1004194800
-          tz.transition 2002, 3, :o3, 1017500400
-          tz.transition 2002, 10, :o2, 1035644400
-          tz.transition 2003, 3, :o3, 1048950000
-          tz.transition 2003, 10, :o2, 1067094000
-          tz.transition 2004, 3, :o3, 1080399600
-          tz.transition 2004, 10, :o2, 1099148400
-          tz.transition 2005, 3, :o3, 1111849200
-          tz.transition 2005, 10, :o2, 1130598000
-          tz.transition 2006, 3, :o3, 1143298800
-          tz.transition 2006, 10, :o2, 1162047600
-          tz.transition 2007, 3, :o3, 1174748400
-          tz.transition 2007, 10, :o2, 1193497200
-          tz.transition 2008, 3, :o3, 1206802800
-          tz.transition 2008, 10, :o2, 1224946800
-          tz.transition 2009, 3, :o3, 1238252400
-          tz.transition 2009, 10, :o2, 1256396400
-          tz.transition 2010, 3, :o3, 1269702000
-          tz.transition 2010, 10, :o2, 1288450800
-          tz.transition 2011, 3, :o3, 1301151600
-          tz.transition 2011, 10, :o2, 1319900400
-          tz.transition 2012, 3, :o3, 1332601200
-          tz.transition 2012, 10, :o2, 1351350000
-          tz.transition 2013, 3, :o3, 1364655600
-          tz.transition 2013, 10, :o2, 1382799600
-          tz.transition 2014, 3, :o3, 1396105200
-          tz.transition 2014, 10, :o2, 1414249200
-          tz.transition 2015, 3, :o3, 1427554800
-          tz.transition 2015, 10, :o2, 1445698800
-          tz.transition 2016, 3, :o3, 1459004400
-          tz.transition 2016, 10, :o2, 1477753200
-          tz.transition 2017, 3, :o3, 1490454000
-          tz.transition 2017, 10, :o2, 1509202800
-          tz.transition 2018, 3, :o3, 1521903600
-          tz.transition 2018, 10, :o2, 1540652400
-          tz.transition 2019, 3, :o3, 1553958000
-          tz.transition 2019, 10, :o2, 1572102000
-          tz.transition 2020, 3, :o3, 1585407600
-          tz.transition 2020, 10, :o2, 1603551600
-          tz.transition 2021, 3, :o3, 1616857200
-          tz.transition 2021, 10, :o2, 1635606000
-          tz.transition 2022, 3, :o3, 1648306800
-          tz.transition 2022, 10, :o2, 1667055600
-          tz.transition 2023, 3, :o3, 1679756400
-          tz.transition 2023, 10, :o2, 1698505200
-          tz.transition 2024, 3, :o3, 1711810800
-          tz.transition 2024, 10, :o2, 1729954800
-          tz.transition 2025, 3, :o3, 1743260400
-          tz.transition 2025, 10, :o2, 1761404400
-          tz.transition 2026, 3, :o3, 1774710000
-          tz.transition 2026, 10, :o2, 1792854000
-          tz.transition 2027, 3, :o3, 1806159600
-          tz.transition 2027, 10, :o2, 1824908400
-          tz.transition 2028, 3, :o3, 1837609200
-          tz.transition 2028, 10, :o2, 1856358000
-          tz.transition 2029, 3, :o3, 1869058800
-          tz.transition 2029, 10, :o2, 1887807600
-          tz.transition 2030, 3, :o3, 1901113200
-          tz.transition 2030, 10, :o2, 1919257200
-          tz.transition 2031, 3, :o3, 1932562800
-          tz.transition 2031, 10, :o2, 1950706800
-          tz.transition 2032, 3, :o3, 1964012400
-          tz.transition 2032, 10, :o2, 1982761200
-          tz.transition 2033, 3, :o3, 1995462000
-          tz.transition 2033, 10, :o2, 2014210800
-          tz.transition 2034, 3, :o3, 2026911600
-          tz.transition 2034, 10, :o2, 2045660400
-          tz.transition 2035, 3, :o3, 2058361200
-          tz.transition 2035, 10, :o2, 2077110000
-          tz.transition 2036, 3, :o3, 2090415600
-          tz.transition 2036, 10, :o2, 2108559600
-          tz.transition 2037, 3, :o3, 2121865200
-          tz.transition 2037, 10, :o2, 2140009200
-          tz.transition 2038, 3, :o3, 19724081, 8
-          tz.transition 2038, 10, :o2, 19725817, 8
-          tz.transition 2039, 3, :o3, 19726993, 8
-          tz.transition 2039, 10, :o2, 19728729, 8
-          tz.transition 2040, 3, :o3, 19729905, 8
-          tz.transition 2040, 10, :o2, 19731641, 8
-          tz.transition 2041, 3, :o3, 19732873, 8
-          tz.transition 2041, 10, :o2, 19734553, 8
-          tz.transition 2042, 3, :o3, 19735785, 8
-          tz.transition 2042, 10, :o2, 19737465, 8
-          tz.transition 2043, 3, :o3, 19738697, 8
-          tz.transition 2043, 10, :o2, 19740377, 8
-          tz.transition 2044, 3, :o3, 19741609, 8
-          tz.transition 2044, 10, :o2, 19743345, 8
-          tz.transition 2045, 3, :o3, 19744521, 8
-          tz.transition 2045, 10, :o2, 19746257, 8
-          tz.transition 2046, 3, :o3, 19747433, 8
-          tz.transition 2046, 10, :o2, 19749169, 8
-          tz.transition 2047, 3, :o3, 19750401, 8
-          tz.transition 2047, 10, :o2, 19752081, 8
-          tz.transition 2048, 3, :o3, 19753313, 8
-          tz.transition 2048, 10, :o2, 19754993, 8
-          tz.transition 2049, 3, :o3, 19756225, 8
-          tz.transition 2049, 10, :o2, 19757961, 8
-          tz.transition 2050, 3, :o3, 19759137, 8
-          tz.transition 2050, 10, :o2, 19760873, 8
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Muscat.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Muscat.rb
deleted file mode 100644
index 604f651dfa..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Muscat.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Muscat
-        include TimezoneDefinition
-        
-        timezone 'Asia/Muscat' do |tz|
-          tz.offset :o0, 14060, 0, :LMT
-          tz.offset :o1, 14400, 0, :GST
-          
-          tz.transition 1919, 12, :o1, 10464441137, 4320
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Novosibirsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Novosibirsk.rb
deleted file mode 100644
index a4e7796e75..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Novosibirsk.rb
+++ /dev/null
@@ -1,164 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Novosibirsk
-        include TimezoneDefinition
-        
-        timezone 'Asia/Novosibirsk' do |tz|
-          tz.offset :o0, 19900, 0, :LMT
-          tz.offset :o1, 21600, 0, :NOVT
-          tz.offset :o2, 25200, 0, :NOVT
-          tz.offset :o3, 25200, 3600, :NOVST
-          tz.offset :o4, 21600, 3600, :NOVST
-          
-          tz.transition 1919, 12, :o1, 2092872833, 864
-          tz.transition 1930, 6, :o2, 9704593, 4
-          tz.transition 1981, 3, :o3, 354906000
-          tz.transition 1981, 9, :o2, 370713600
-          tz.transition 1982, 3, :o3, 386442000
-          tz.transition 1982, 9, :o2, 402249600
-          tz.transition 1983, 3, :o3, 417978000
-          tz.transition 1983, 9, :o2, 433785600
-          tz.transition 1984, 3, :o3, 449600400
-          tz.transition 1984, 9, :o2, 465332400
-          tz.transition 1985, 3, :o3, 481057200
-          tz.transition 1985, 9, :o2, 496782000
-          tz.transition 1986, 3, :o3, 512506800
-          tz.transition 1986, 9, :o2, 528231600
-          tz.transition 1987, 3, :o3, 543956400
-          tz.transition 1987, 9, :o2, 559681200
-          tz.transition 1988, 3, :o3, 575406000
-          tz.transition 1988, 9, :o2, 591130800
-          tz.transition 1989, 3, :o3, 606855600
-          tz.transition 1989, 9, :o2, 622580400
-          tz.transition 1990, 3, :o3, 638305200
-          tz.transition 1990, 9, :o2, 654634800
-          tz.transition 1991, 3, :o4, 670359600
-          tz.transition 1991, 9, :o1, 686088000
-          tz.transition 1992, 1, :o2, 695764800
-          tz.transition 1992, 3, :o3, 701798400
-          tz.transition 1992, 9, :o2, 717519600
-          tz.transition 1993, 3, :o3, 733258800
-          tz.transition 1993, 5, :o4, 738086400
-          tz.transition 1993, 9, :o1, 748987200
-          tz.transition 1994, 3, :o4, 764712000
-          tz.transition 1994, 9, :o1, 780436800
-          tz.transition 1995, 3, :o4, 796161600
-          tz.transition 1995, 9, :o1, 811886400
-          tz.transition 1996, 3, :o4, 828216000
-          tz.transition 1996, 10, :o1, 846360000
-          tz.transition 1997, 3, :o4, 859665600
-          tz.transition 1997, 10, :o1, 877809600
-          tz.transition 1998, 3, :o4, 891115200
-          tz.transition 1998, 10, :o1, 909259200
-          tz.transition 1999, 3, :o4, 922564800
-          tz.transition 1999, 10, :o1, 941313600
-          tz.transition 2000, 3, :o4, 954014400
-          tz.transition 2000, 10, :o1, 972763200
-          tz.transition 2001, 3, :o4, 985464000
-          tz.transition 2001, 10, :o1, 1004212800
-          tz.transition 2002, 3, :o4, 1017518400
-          tz.transition 2002, 10, :o1, 1035662400
-          tz.transition 2003, 3, :o4, 1048968000
-          tz.transition 2003, 10, :o1, 1067112000
-          tz.transition 2004, 3, :o4, 1080417600
-          tz.transition 2004, 10, :o1, 1099166400
-          tz.transition 2005, 3, :o4, 1111867200
-          tz.transition 2005, 10, :o1, 1130616000
-          tz.transition 2006, 3, :o4, 1143316800
-          tz.transition 2006, 10, :o1, 1162065600
-          tz.transition 2007, 3, :o4, 1174766400
-          tz.transition 2007, 10, :o1, 1193515200
-          tz.transition 2008, 3, :o4, 1206820800
-          tz.transition 2008, 10, :o1, 1224964800
-          tz.transition 2009, 3, :o4, 1238270400
-          tz.transition 2009, 10, :o1, 1256414400
-          tz.transition 2010, 3, :o4, 1269720000
-          tz.transition 2010, 10, :o1, 1288468800
-          tz.transition 2011, 3, :o4, 1301169600
-          tz.transition 2011, 10, :o1, 1319918400
-          tz.transition 2012, 3, :o4, 1332619200
-          tz.transition 2012, 10, :o1, 1351368000
-          tz.transition 2013, 3, :o4, 1364673600
-          tz.transition 2013, 10, :o1, 1382817600
-          tz.transition 2014, 3, :o4, 1396123200
-          tz.transition 2014, 10, :o1, 1414267200
-          tz.transition 2015, 3, :o4, 1427572800
-          tz.transition 2015, 10, :o1, 1445716800
-          tz.transition 2016, 3, :o4, 1459022400
-          tz.transition 2016, 10, :o1, 1477771200
-          tz.transition 2017, 3, :o4, 1490472000
-          tz.transition 2017, 10, :o1, 1509220800
-          tz.transition 2018, 3, :o4, 1521921600
-          tz.transition 2018, 10, :o1, 1540670400
-          tz.transition 2019, 3, :o4, 1553976000
-          tz.transition 2019, 10, :o1, 1572120000
-          tz.transition 2020, 3, :o4, 1585425600
-          tz.transition 2020, 10, :o1, 1603569600
-          tz.transition 2021, 3, :o4, 1616875200
-          tz.transition 2021, 10, :o1, 1635624000
-          tz.transition 2022, 3, :o4, 1648324800
-          tz.transition 2022, 10, :o1, 1667073600
-          tz.transition 2023, 3, :o4, 1679774400
-          tz.transition 2023, 10, :o1, 1698523200
-          tz.transition 2024, 3, :o4, 1711828800
-          tz.transition 2024, 10, :o1, 1729972800
-          tz.transition 2025, 3, :o4, 1743278400
-          tz.transition 2025, 10, :o1, 1761422400
-          tz.transition 2026, 3, :o4, 1774728000
-          tz.transition 2026, 10, :o1, 1792872000
-          tz.transition 2027, 3, :o4, 1806177600
-          tz.transition 2027, 10, :o1, 1824926400
-          tz.transition 2028, 3, :o4, 1837627200
-          tz.transition 2028, 10, :o1, 1856376000
-          tz.transition 2029, 3, :o4, 1869076800
-          tz.transition 2029, 10, :o1, 1887825600
-          tz.transition 2030, 3, :o4, 1901131200
-          tz.transition 2030, 10, :o1, 1919275200
-          tz.transition 2031, 3, :o4, 1932580800
-          tz.transition 2031, 10, :o1, 1950724800
-          tz.transition 2032, 3, :o4, 1964030400
-          tz.transition 2032, 10, :o1, 1982779200
-          tz.transition 2033, 3, :o4, 1995480000
-          tz.transition 2033, 10, :o1, 2014228800
-          tz.transition 2034, 3, :o4, 2026929600
-          tz.transition 2034, 10, :o1, 2045678400
-          tz.transition 2035, 3, :o4, 2058379200
-          tz.transition 2035, 10, :o1, 2077128000
-          tz.transition 2036, 3, :o4, 2090433600
-          tz.transition 2036, 10, :o1, 2108577600
-          tz.transition 2037, 3, :o4, 2121883200
-          tz.transition 2037, 10, :o1, 2140027200
-          tz.transition 2038, 3, :o4, 7396531, 3
-          tz.transition 2038, 10, :o1, 7397182, 3
-          tz.transition 2039, 3, :o4, 7397623, 3
-          tz.transition 2039, 10, :o1, 7398274, 3
-          tz.transition 2040, 3, :o4, 7398715, 3
-          tz.transition 2040, 10, :o1, 7399366, 3
-          tz.transition 2041, 3, :o4, 7399828, 3
-          tz.transition 2041, 10, :o1, 7400458, 3
-          tz.transition 2042, 3, :o4, 7400920, 3
-          tz.transition 2042, 10, :o1, 7401550, 3
-          tz.transition 2043, 3, :o4, 7402012, 3
-          tz.transition 2043, 10, :o1, 7402642, 3
-          tz.transition 2044, 3, :o4, 7403104, 3
-          tz.transition 2044, 10, :o1, 7403755, 3
-          tz.transition 2045, 3, :o4, 7404196, 3
-          tz.transition 2045, 10, :o1, 7404847, 3
-          tz.transition 2046, 3, :o4, 7405288, 3
-          tz.transition 2046, 10, :o1, 7405939, 3
-          tz.transition 2047, 3, :o4, 7406401, 3
-          tz.transition 2047, 10, :o1, 7407031, 3
-          tz.transition 2048, 3, :o4, 7407493, 3
-          tz.transition 2048, 10, :o1, 7408123, 3
-          tz.transition 2049, 3, :o4, 7408585, 3
-          tz.transition 2049, 10, :o1, 7409236, 3
-          tz.transition 2050, 3, :o4, 7409677, 3
-          tz.transition 2050, 10, :o1, 7410328, 3
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Rangoon.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Rangoon.rb
deleted file mode 100644
index 759b82d77a..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Rangoon.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Rangoon
-        include TimezoneDefinition
-        
-        timezone 'Asia/Rangoon' do |tz|
-          tz.offset :o0, 23080, 0, :LMT
-          tz.offset :o1, 23076, 0, :RMT
-          tz.offset :o2, 23400, 0, :BURT
-          tz.offset :o3, 32400, 0, :JST
-          tz.offset :o4, 23400, 0, :MMT
-          
-          tz.transition 1879, 12, :o1, 5200664903, 2160
-          tz.transition 1919, 12, :o2, 5813578159, 2400
-          tz.transition 1942, 4, :o3, 116663051, 48
-          tz.transition 1945, 5, :o4, 19452625, 8
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Riyadh.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Riyadh.rb
deleted file mode 100644
index 7add410620..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Riyadh.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Riyadh
-        include TimezoneDefinition
-        
-        timezone 'Asia/Riyadh' do |tz|
-          tz.offset :o0, 11212, 0, :LMT
-          tz.offset :o1, 10800, 0, :AST
-          
-          tz.transition 1949, 12, :o1, 52558899197, 21600
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Seoul.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Seoul.rb
deleted file mode 100644
index 795d2a75df..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Seoul.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Seoul
-        include TimezoneDefinition
-        
-        timezone 'Asia/Seoul' do |tz|
-          tz.offset :o0, 30472, 0, :LMT
-          tz.offset :o1, 30600, 0, :KST
-          tz.offset :o2, 32400, 0, :KST
-          tz.offset :o3, 28800, 0, :KST
-          tz.offset :o4, 28800, 3600, :KDT
-          tz.offset :o5, 32400, 3600, :KDT
-          
-          tz.transition 1889, 12, :o1, 26042775991, 10800
-          tz.transition 1904, 11, :o2, 116007127, 48
-          tz.transition 1927, 12, :o1, 19401969, 8
-          tz.transition 1931, 12, :o2, 116481943, 48
-          tz.transition 1954, 3, :o3, 19478577, 8
-          tz.transition 1960, 5, :o4, 14622415, 6
-          tz.transition 1960, 9, :o3, 19497521, 8
-          tz.transition 1961, 8, :o1, 14625127, 6
-          tz.transition 1968, 9, :o2, 117126247, 48
-          tz.transition 1987, 5, :o5, 547570800
-          tz.transition 1987, 10, :o2, 560872800
-          tz.transition 1988, 5, :o5, 579020400
-          tz.transition 1988, 10, :o2, 592322400
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Shanghai.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Shanghai.rb
deleted file mode 100644
index 34b13d59ae..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Shanghai.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Shanghai
-        include TimezoneDefinition
-        
-        timezone 'Asia/Shanghai' do |tz|
-          tz.offset :o0, 29152, 0, :LMT
-          tz.offset :o1, 28800, 0, :CST
-          tz.offset :o2, 28800, 3600, :CDT
-          
-          tz.transition 1927, 12, :o1, 6548164639, 2700
-          tz.transition 1940, 6, :o2, 14578699, 6
-          tz.transition 1940, 9, :o1, 19439225, 8
-          tz.transition 1941, 3, :o2, 14580415, 6
-          tz.transition 1941, 9, :o1, 19442145, 8
-          tz.transition 1986, 5, :o2, 515520000
-          tz.transition 1986, 9, :o1, 527007600
-          tz.transition 1987, 4, :o2, 545155200
-          tz.transition 1987, 9, :o1, 558457200
-          tz.transition 1988, 4, :o2, 576604800
-          tz.transition 1988, 9, :o1, 589906800
-          tz.transition 1989, 4, :o2, 608659200
-          tz.transition 1989, 9, :o1, 621961200
-          tz.transition 1990, 4, :o2, 640108800
-          tz.transition 1990, 9, :o1, 653410800
-          tz.transition 1991, 4, :o2, 671558400
-          tz.transition 1991, 9, :o1, 684860400
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Singapore.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Singapore.rb
deleted file mode 100644
index b323a78f74..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Singapore.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Singapore
-        include TimezoneDefinition
-        
-        timezone 'Asia/Singapore' do |tz|
-          tz.offset :o0, 24925, 0, :LMT
-          tz.offset :o1, 24925, 0, :SMT
-          tz.offset :o2, 25200, 0, :MALT
-          tz.offset :o3, 25200, 1200, :MALST
-          tz.offset :o4, 26400, 0, :MALT
-          tz.offset :o5, 27000, 0, :MALT
-          tz.offset :o6, 32400, 0, :JST
-          tz.offset :o7, 27000, 0, :SGT
-          tz.offset :o8, 28800, 0, :SGT
-          
-          tz.transition 1900, 12, :o1, 8347571291, 3456
-          tz.transition 1905, 5, :o2, 8353142363, 3456
-          tz.transition 1932, 12, :o3, 58249757, 24
-          tz.transition 1935, 12, :o4, 87414055, 36
-          tz.transition 1941, 8, :o5, 87488575, 36
-          tz.transition 1942, 2, :o6, 38886499, 16
-          tz.transition 1945, 9, :o5, 19453681, 8
-          tz.transition 1965, 8, :o7, 39023699, 16
-          tz.transition 1981, 12, :o8, 378664200
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Taipei.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Taipei.rb
deleted file mode 100644
index 3ba12108fb..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Taipei.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Taipei
-        include TimezoneDefinition
-        
-        timezone 'Asia/Taipei' do |tz|
-          tz.offset :o0, 29160, 0, :LMT
-          tz.offset :o1, 28800, 0, :CST
-          tz.offset :o2, 28800, 3600, :CDT
-          
-          tz.transition 1895, 12, :o1, 193084733, 80
-          tz.transition 1945, 4, :o2, 14589457, 6
-          tz.transition 1945, 9, :o1, 19453833, 8
-          tz.transition 1946, 4, :o2, 14591647, 6
-          tz.transition 1946, 9, :o1, 19456753, 8
-          tz.transition 1947, 4, :o2, 14593837, 6
-          tz.transition 1947, 9, :o1, 19459673, 8
-          tz.transition 1948, 4, :o2, 14596033, 6
-          tz.transition 1948, 9, :o1, 19462601, 8
-          tz.transition 1949, 4, :o2, 14598223, 6
-          tz.transition 1949, 9, :o1, 19465521, 8
-          tz.transition 1950, 4, :o2, 14600413, 6
-          tz.transition 1950, 9, :o1, 19468441, 8
-          tz.transition 1951, 4, :o2, 14602603, 6
-          tz.transition 1951, 9, :o1, 19471361, 8
-          tz.transition 1952, 2, :o2, 14604433, 6
-          tz.transition 1952, 10, :o1, 19474537, 8
-          tz.transition 1953, 3, :o2, 14606809, 6
-          tz.transition 1953, 10, :o1, 19477457, 8
-          tz.transition 1954, 3, :o2, 14608999, 6
-          tz.transition 1954, 10, :o1, 19480377, 8
-          tz.transition 1955, 3, :o2, 14611189, 6
-          tz.transition 1955, 9, :o1, 19483049, 8
-          tz.transition 1956, 3, :o2, 14613385, 6
-          tz.transition 1956, 9, :o1, 19485977, 8
-          tz.transition 1957, 3, :o2, 14615575, 6
-          tz.transition 1957, 9, :o1, 19488897, 8
-          tz.transition 1958, 3, :o2, 14617765, 6
-          tz.transition 1958, 9, :o1, 19491817, 8
-          tz.transition 1959, 3, :o2, 14619955, 6
-          tz.transition 1959, 9, :o1, 19494737, 8
-          tz.transition 1960, 5, :o2, 14622517, 6
-          tz.transition 1960, 9, :o1, 19497665, 8
-          tz.transition 1961, 5, :o2, 14624707, 6
-          tz.transition 1961, 9, :o1, 19500585, 8
-          tz.transition 1974, 3, :o2, 133977600
-          tz.transition 1974, 9, :o1, 149785200
-          tz.transition 1975, 3, :o2, 165513600
-          tz.transition 1975, 9, :o1, 181321200
-          tz.transition 1980, 6, :o2, 331142400
-          tz.transition 1980, 9, :o1, 339087600
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tashkent.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tashkent.rb
deleted file mode 100644
index c205c7934d..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tashkent.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Tashkent
-        include TimezoneDefinition
-        
-        timezone 'Asia/Tashkent' do |tz|
-          tz.offset :o0, 16632, 0, :LMT
-          tz.offset :o1, 18000, 0, :TAST
-          tz.offset :o2, 21600, 0, :TAST
-          tz.offset :o3, 21600, 3600, :TASST
-          tz.offset :o4, 18000, 3600, :TASST
-          tz.offset :o5, 18000, 3600, :UZST
-          tz.offset :o6, 18000, 0, :UZT
-          
-          tz.transition 1924, 5, :o1, 969562923, 400
-          tz.transition 1930, 6, :o2, 58227559, 24
-          tz.transition 1981, 3, :o3, 354909600
-          tz.transition 1981, 9, :o2, 370717200
-          tz.transition 1982, 3, :o3, 386445600
-          tz.transition 1982, 9, :o2, 402253200
-          tz.transition 1983, 3, :o3, 417981600
-          tz.transition 1983, 9, :o2, 433789200
-          tz.transition 1984, 3, :o3, 449604000
-          tz.transition 1984, 9, :o2, 465336000
-          tz.transition 1985, 3, :o3, 481060800
-          tz.transition 1985, 9, :o2, 496785600
-          tz.transition 1986, 3, :o3, 512510400
-          tz.transition 1986, 9, :o2, 528235200
-          tz.transition 1987, 3, :o3, 543960000
-          tz.transition 1987, 9, :o2, 559684800
-          tz.transition 1988, 3, :o3, 575409600
-          tz.transition 1988, 9, :o2, 591134400
-          tz.transition 1989, 3, :o3, 606859200
-          tz.transition 1989, 9, :o2, 622584000
-          tz.transition 1990, 3, :o3, 638308800
-          tz.transition 1990, 9, :o2, 654638400
-          tz.transition 1991, 3, :o4, 670363200
-          tz.transition 1991, 8, :o5, 683661600
-          tz.transition 1991, 9, :o6, 686091600
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tbilisi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tbilisi.rb
deleted file mode 100644
index 15792a5651..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tbilisi.rb
+++ /dev/null
@@ -1,78 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Tbilisi
-        include TimezoneDefinition
-        
-        timezone 'Asia/Tbilisi' do |tz|
-          tz.offset :o0, 10756, 0, :LMT
-          tz.offset :o1, 10756, 0, :TBMT
-          tz.offset :o2, 10800, 0, :TBIT
-          tz.offset :o3, 14400, 0, :TBIT
-          tz.offset :o4, 14400, 3600, :TBIST
-          tz.offset :o5, 10800, 3600, :TBIST
-          tz.offset :o6, 10800, 3600, :GEST
-          tz.offset :o7, 10800, 0, :GET
-          tz.offset :o8, 14400, 0, :GET
-          tz.offset :o9, 14400, 3600, :GEST
-          
-          tz.transition 1879, 12, :o1, 52006652111, 21600
-          tz.transition 1924, 5, :o2, 52356399311, 21600
-          tz.transition 1957, 2, :o3, 19487187, 8
-          tz.transition 1981, 3, :o4, 354916800
-          tz.transition 1981, 9, :o3, 370724400
-          tz.transition 1982, 3, :o4, 386452800
-          tz.transition 1982, 9, :o3, 402260400
-          tz.transition 1983, 3, :o4, 417988800
-          tz.transition 1983, 9, :o3, 433796400
-          tz.transition 1984, 3, :o4, 449611200
-          tz.transition 1984, 9, :o3, 465343200
-          tz.transition 1985, 3, :o4, 481068000
-          tz.transition 1985, 9, :o3, 496792800
-          tz.transition 1986, 3, :o4, 512517600
-          tz.transition 1986, 9, :o3, 528242400
-          tz.transition 1987, 3, :o4, 543967200
-          tz.transition 1987, 9, :o3, 559692000
-          tz.transition 1988, 3, :o4, 575416800
-          tz.transition 1988, 9, :o3, 591141600
-          tz.transition 1989, 3, :o4, 606866400
-          tz.transition 1989, 9, :o3, 622591200
-          tz.transition 1990, 3, :o4, 638316000
-          tz.transition 1990, 9, :o3, 654645600
-          tz.transition 1991, 3, :o5, 670370400
-          tz.transition 1991, 4, :o6, 671140800
-          tz.transition 1991, 9, :o7, 686098800
-          tz.transition 1992, 3, :o6, 701816400
-          tz.transition 1992, 9, :o7, 717537600
-          tz.transition 1993, 3, :o6, 733266000
-          tz.transition 1993, 9, :o7, 748987200
-          tz.transition 1994, 3, :o6, 764715600
-          tz.transition 1994, 9, :o8, 780436800
-          tz.transition 1995, 3, :o9, 796161600
-          tz.transition 1995, 9, :o8, 811882800
-          tz.transition 1996, 3, :o9, 828216000
-          tz.transition 1997, 3, :o9, 859662000
-          tz.transition 1997, 10, :o8, 877806000
-          tz.transition 1998, 3, :o9, 891115200
-          tz.transition 1998, 10, :o8, 909255600
-          tz.transition 1999, 3, :o9, 922564800
-          tz.transition 1999, 10, :o8, 941310000
-          tz.transition 2000, 3, :o9, 954014400
-          tz.transition 2000, 10, :o8, 972759600
-          tz.transition 2001, 3, :o9, 985464000
-          tz.transition 2001, 10, :o8, 1004209200
-          tz.transition 2002, 3, :o9, 1017518400
-          tz.transition 2002, 10, :o8, 1035658800
-          tz.transition 2003, 3, :o9, 1048968000
-          tz.transition 2003, 10, :o8, 1067108400
-          tz.transition 2004, 3, :o9, 1080417600
-          tz.transition 2004, 6, :o6, 1088276400
-          tz.transition 2004, 10, :o7, 1099177200
-          tz.transition 2005, 3, :o8, 1111878000
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tehran.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tehran.rb
deleted file mode 100644
index d8df964a46..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tehran.rb
+++ /dev/null
@@ -1,121 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Tehran
-        include TimezoneDefinition
-        
-        timezone 'Asia/Tehran' do |tz|
-          tz.offset :o0, 12344, 0, :LMT
-          tz.offset :o1, 12344, 0, :TMT
-          tz.offset :o2, 12600, 0, :IRST
-          tz.offset :o3, 14400, 0, :IRST
-          tz.offset :o4, 14400, 3600, :IRDT
-          tz.offset :o5, 12600, 3600, :IRDT
-          
-          tz.transition 1915, 12, :o1, 26145324257, 10800
-          tz.transition 1945, 12, :o2, 26263670657, 10800
-          tz.transition 1977, 10, :o3, 247177800
-          tz.transition 1978, 3, :o4, 259272000
-          tz.transition 1978, 10, :o3, 277758000
-          tz.transition 1978, 12, :o2, 283982400
-          tz.transition 1979, 3, :o5, 290809800
-          tz.transition 1979, 9, :o2, 306531000
-          tz.transition 1980, 3, :o5, 322432200
-          tz.transition 1980, 9, :o2, 338499000
-          tz.transition 1991, 5, :o5, 673216200
-          tz.transition 1991, 9, :o2, 685481400
-          tz.transition 1992, 3, :o5, 701209800
-          tz.transition 1992, 9, :o2, 717103800
-          tz.transition 1993, 3, :o5, 732745800
-          tz.transition 1993, 9, :o2, 748639800
-          tz.transition 1994, 3, :o5, 764281800
-          tz.transition 1994, 9, :o2, 780175800
-          tz.transition 1995, 3, :o5, 795817800
-          tz.transition 1995, 9, :o2, 811711800
-          tz.transition 1996, 3, :o5, 827353800
-          tz.transition 1996, 9, :o2, 843247800
-          tz.transition 1997, 3, :o5, 858976200
-          tz.transition 1997, 9, :o2, 874870200
-          tz.transition 1998, 3, :o5, 890512200
-          tz.transition 1998, 9, :o2, 906406200
-          tz.transition 1999, 3, :o5, 922048200
-          tz.transition 1999, 9, :o2, 937942200
-          tz.transition 2000, 3, :o5, 953584200
-          tz.transition 2000, 9, :o2, 969478200
-          tz.transition 2001, 3, :o5, 985206600
-          tz.transition 2001, 9, :o2, 1001100600
-          tz.transition 2002, 3, :o5, 1016742600
-          tz.transition 2002, 9, :o2, 1032636600
-          tz.transition 2003, 3, :o5, 1048278600
-          tz.transition 2003, 9, :o2, 1064172600
-          tz.transition 2004, 3, :o5, 1079814600
-          tz.transition 2004, 9, :o2, 1095708600
-          tz.transition 2005, 3, :o5, 1111437000
-          tz.transition 2005, 9, :o2, 1127331000
-          tz.transition 2008, 3, :o5, 1206045000
-          tz.transition 2008, 9, :o2, 1221939000
-          tz.transition 2009, 3, :o5, 1237667400
-          tz.transition 2009, 9, :o2, 1253561400
-          tz.transition 2010, 3, :o5, 1269203400
-          tz.transition 2010, 9, :o2, 1285097400
-          tz.transition 2011, 3, :o5, 1300739400
-          tz.transition 2011, 9, :o2, 1316633400
-          tz.transition 2012, 3, :o5, 1332275400
-          tz.transition 2012, 9, :o2, 1348169400
-          tz.transition 2013, 3, :o5, 1363897800
-          tz.transition 2013, 9, :o2, 1379791800
-          tz.transition 2014, 3, :o5, 1395433800
-          tz.transition 2014, 9, :o2, 1411327800
-          tz.transition 2015, 3, :o5, 1426969800
-          tz.transition 2015, 9, :o2, 1442863800
-          tz.transition 2016, 3, :o5, 1458505800
-          tz.transition 2016, 9, :o2, 1474399800
-          tz.transition 2017, 3, :o5, 1490128200
-          tz.transition 2017, 9, :o2, 1506022200
-          tz.transition 2018, 3, :o5, 1521664200
-          tz.transition 2018, 9, :o2, 1537558200
-          tz.transition 2019, 3, :o5, 1553200200
-          tz.transition 2019, 9, :o2, 1569094200
-          tz.transition 2020, 3, :o5, 1584736200
-          tz.transition 2020, 9, :o2, 1600630200
-          tz.transition 2021, 3, :o5, 1616358600
-          tz.transition 2021, 9, :o2, 1632252600
-          tz.transition 2022, 3, :o5, 1647894600
-          tz.transition 2022, 9, :o2, 1663788600
-          tz.transition 2023, 3, :o5, 1679430600
-          tz.transition 2023, 9, :o2, 1695324600
-          tz.transition 2024, 3, :o5, 1710966600
-          tz.transition 2024, 9, :o2, 1726860600
-          tz.transition 2025, 3, :o5, 1742589000
-          tz.transition 2025, 9, :o2, 1758483000
-          tz.transition 2026, 3, :o5, 1774125000
-          tz.transition 2026, 9, :o2, 1790019000
-          tz.transition 2027, 3, :o5, 1805661000
-          tz.transition 2027, 9, :o2, 1821555000
-          tz.transition 2028, 3, :o5, 1837197000
-          tz.transition 2028, 9, :o2, 1853091000
-          tz.transition 2029, 3, :o5, 1868733000
-          tz.transition 2029, 9, :o2, 1884627000
-          tz.transition 2030, 3, :o5, 1900355400
-          tz.transition 2030, 9, :o2, 1916249400
-          tz.transition 2031, 3, :o5, 1931891400
-          tz.transition 2031, 9, :o2, 1947785400
-          tz.transition 2032, 3, :o5, 1963427400
-          tz.transition 2032, 9, :o2, 1979321400
-          tz.transition 2033, 3, :o5, 1994963400
-          tz.transition 2033, 9, :o2, 2010857400
-          tz.transition 2034, 3, :o5, 2026585800
-          tz.transition 2034, 9, :o2, 2042479800
-          tz.transition 2035, 3, :o5, 2058121800
-          tz.transition 2035, 9, :o2, 2074015800
-          tz.transition 2036, 3, :o5, 2089657800
-          tz.transition 2036, 9, :o2, 2105551800
-          tz.transition 2037, 3, :o5, 2121193800
-          tz.transition 2037, 9, :o2, 2137087800
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tokyo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tokyo.rb
deleted file mode 100644
index 51c9e16421..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tokyo.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Tokyo
-        include TimezoneDefinition
-        
-        timezone 'Asia/Tokyo' do |tz|
-          tz.offset :o0, 33539, 0, :LMT
-          tz.offset :o1, 32400, 0, :JST
-          tz.offset :o2, 32400, 0, :CJT
-          tz.offset :o3, 32400, 3600, :JDT
-          
-          tz.transition 1887, 12, :o1, 19285097, 8
-          tz.transition 1895, 12, :o2, 19308473, 8
-          tz.transition 1937, 12, :o1, 19431193, 8
-          tz.transition 1948, 5, :o3, 58384157, 24
-          tz.transition 1948, 9, :o1, 14596831, 6
-          tz.transition 1949, 4, :o3, 58392221, 24
-          tz.transition 1949, 9, :o1, 14599015, 6
-          tz.transition 1950, 5, :o3, 58401797, 24
-          tz.transition 1950, 9, :o1, 14601199, 6
-          tz.transition 1951, 5, :o3, 58410533, 24
-          tz.transition 1951, 9, :o1, 14603383, 6
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb
deleted file mode 100644
index 2854f5c5fd..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Ulaanbaatar
-        include TimezoneDefinition
-        
-        timezone 'Asia/Ulaanbaatar' do |tz|
-          tz.offset :o0, 25652, 0, :LMT
-          tz.offset :o1, 25200, 0, :ULAT
-          tz.offset :o2, 28800, 0, :ULAT
-          tz.offset :o3, 28800, 3600, :ULAST
-          
-          tz.transition 1905, 7, :o1, 52208457187, 21600
-          tz.transition 1977, 12, :o2, 252435600
-          tz.transition 1983, 3, :o3, 417974400
-          tz.transition 1983, 9, :o2, 433782000
-          tz.transition 1984, 3, :o3, 449596800
-          tz.transition 1984, 9, :o2, 465318000
-          tz.transition 1985, 3, :o3, 481046400
-          tz.transition 1985, 9, :o2, 496767600
-          tz.transition 1986, 3, :o3, 512496000
-          tz.transition 1986, 9, :o2, 528217200
-          tz.transition 1987, 3, :o3, 543945600
-          tz.transition 1987, 9, :o2, 559666800
-          tz.transition 1988, 3, :o3, 575395200
-          tz.transition 1988, 9, :o2, 591116400
-          tz.transition 1989, 3, :o3, 606844800
-          tz.transition 1989, 9, :o2, 622566000
-          tz.transition 1990, 3, :o3, 638294400
-          tz.transition 1990, 9, :o2, 654620400
-          tz.transition 1991, 3, :o3, 670348800
-          tz.transition 1991, 9, :o2, 686070000
-          tz.transition 1992, 3, :o3, 701798400
-          tz.transition 1992, 9, :o2, 717519600
-          tz.transition 1993, 3, :o3, 733248000
-          tz.transition 1993, 9, :o2, 748969200
-          tz.transition 1994, 3, :o3, 764697600
-          tz.transition 1994, 9, :o2, 780418800
-          tz.transition 1995, 3, :o3, 796147200
-          tz.transition 1995, 9, :o2, 811868400
-          tz.transition 1996, 3, :o3, 828201600
-          tz.transition 1996, 9, :o2, 843922800
-          tz.transition 1997, 3, :o3, 859651200
-          tz.transition 1997, 9, :o2, 875372400
-          tz.transition 1998, 3, :o3, 891100800
-          tz.transition 1998, 9, :o2, 906822000
-          tz.transition 2001, 4, :o3, 988394400
-          tz.transition 2001, 9, :o2, 1001696400
-          tz.transition 2002, 3, :o3, 1017424800
-          tz.transition 2002, 9, :o2, 1033146000
-          tz.transition 2003, 3, :o3, 1048874400
-          tz.transition 2003, 9, :o2, 1064595600
-          tz.transition 2004, 3, :o3, 1080324000
-          tz.transition 2004, 9, :o2, 1096045200
-          tz.transition 2005, 3, :o3, 1111773600
-          tz.transition 2005, 9, :o2, 1127494800
-          tz.transition 2006, 3, :o3, 1143223200
-          tz.transition 2006, 9, :o2, 1159549200
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Urumqi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Urumqi.rb
deleted file mode 100644
index d793ff1341..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Urumqi.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Urumqi
-        include TimezoneDefinition
-        
-        timezone 'Asia/Urumqi' do |tz|
-          tz.offset :o0, 21020, 0, :LMT
-          tz.offset :o1, 21600, 0, :URUT
-          tz.offset :o2, 28800, 0, :CST
-          tz.offset :o3, 28800, 3600, :CDT
-          
-          tz.transition 1927, 12, :o1, 10477063829, 4320
-          tz.transition 1980, 4, :o2, 325965600
-          tz.transition 1986, 5, :o3, 515520000
-          tz.transition 1986, 9, :o2, 527007600
-          tz.transition 1987, 4, :o3, 545155200
-          tz.transition 1987, 9, :o2, 558457200
-          tz.transition 1988, 4, :o3, 576604800
-          tz.transition 1988, 9, :o2, 589906800
-          tz.transition 1989, 4, :o3, 608659200
-          tz.transition 1989, 9, :o2, 621961200
-          tz.transition 1990, 4, :o3, 640108800
-          tz.transition 1990, 9, :o2, 653410800
-          tz.transition 1991, 4, :o3, 671558400
-          tz.transition 1991, 9, :o2, 684860400
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Vladivostok.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Vladivostok.rb
deleted file mode 100644
index bd9e3d60ec..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Vladivostok.rb
+++ /dev/null
@@ -1,164 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Vladivostok
-        include TimezoneDefinition
-        
-        timezone 'Asia/Vladivostok' do |tz|
-          tz.offset :o0, 31664, 0, :LMT
-          tz.offset :o1, 32400, 0, :VLAT
-          tz.offset :o2, 36000, 0, :VLAT
-          tz.offset :o3, 36000, 3600, :VLAST
-          tz.offset :o4, 32400, 3600, :VLASST
-          tz.offset :o5, 32400, 0, :VLAST
-          
-          tz.transition 1922, 11, :o1, 13086214921, 5400
-          tz.transition 1930, 6, :o2, 19409185, 8
-          tz.transition 1981, 3, :o3, 354895200
-          tz.transition 1981, 9, :o2, 370702800
-          tz.transition 1982, 3, :o3, 386431200
-          tz.transition 1982, 9, :o2, 402238800
-          tz.transition 1983, 3, :o3, 417967200
-          tz.transition 1983, 9, :o2, 433774800
-          tz.transition 1984, 3, :o3, 449589600
-          tz.transition 1984, 9, :o2, 465321600
-          tz.transition 1985, 3, :o3, 481046400
-          tz.transition 1985, 9, :o2, 496771200
-          tz.transition 1986, 3, :o3, 512496000
-          tz.transition 1986, 9, :o2, 528220800
-          tz.transition 1987, 3, :o3, 543945600
-          tz.transition 1987, 9, :o2, 559670400
-          tz.transition 1988, 3, :o3, 575395200
-          tz.transition 1988, 9, :o2, 591120000
-          tz.transition 1989, 3, :o3, 606844800
-          tz.transition 1989, 9, :o2, 622569600
-          tz.transition 1990, 3, :o3, 638294400
-          tz.transition 1990, 9, :o2, 654624000
-          tz.transition 1991, 3, :o4, 670348800
-          tz.transition 1991, 9, :o5, 686077200
-          tz.transition 1992, 1, :o2, 695754000
-          tz.transition 1992, 3, :o3, 701787600
-          tz.transition 1992, 9, :o2, 717508800
-          tz.transition 1993, 3, :o3, 733248000
-          tz.transition 1993, 9, :o2, 748972800
-          tz.transition 1994, 3, :o3, 764697600
-          tz.transition 1994, 9, :o2, 780422400
-          tz.transition 1995, 3, :o3, 796147200
-          tz.transition 1995, 9, :o2, 811872000
-          tz.transition 1996, 3, :o3, 828201600
-          tz.transition 1996, 10, :o2, 846345600
-          tz.transition 1997, 3, :o3, 859651200
-          tz.transition 1997, 10, :o2, 877795200
-          tz.transition 1998, 3, :o3, 891100800
-          tz.transition 1998, 10, :o2, 909244800
-          tz.transition 1999, 3, :o3, 922550400
-          tz.transition 1999, 10, :o2, 941299200
-          tz.transition 2000, 3, :o3, 954000000
-          tz.transition 2000, 10, :o2, 972748800
-          tz.transition 2001, 3, :o3, 985449600
-          tz.transition 2001, 10, :o2, 1004198400
-          tz.transition 2002, 3, :o3, 1017504000
-          tz.transition 2002, 10, :o2, 1035648000
-          tz.transition 2003, 3, :o3, 1048953600
-          tz.transition 2003, 10, :o2, 1067097600
-          tz.transition 2004, 3, :o3, 1080403200
-          tz.transition 2004, 10, :o2, 1099152000
-          tz.transition 2005, 3, :o3, 1111852800
-          tz.transition 2005, 10, :o2, 1130601600
-          tz.transition 2006, 3, :o3, 1143302400
-          tz.transition 2006, 10, :o2, 1162051200
-          tz.transition 2007, 3, :o3, 1174752000
-          tz.transition 2007, 10, :o2, 1193500800
-          tz.transition 2008, 3, :o3, 1206806400
-          tz.transition 2008, 10, :o2, 1224950400
-          tz.transition 2009, 3, :o3, 1238256000
-          tz.transition 2009, 10, :o2, 1256400000
-          tz.transition 2010, 3, :o3, 1269705600
-          tz.transition 2010, 10, :o2, 1288454400
-          tz.transition 2011, 3, :o3, 1301155200
-          tz.transition 2011, 10, :o2, 1319904000
-          tz.transition 2012, 3, :o3, 1332604800
-          tz.transition 2012, 10, :o2, 1351353600
-          tz.transition 2013, 3, :o3, 1364659200
-          tz.transition 2013, 10, :o2, 1382803200
-          tz.transition 2014, 3, :o3, 1396108800
-          tz.transition 2014, 10, :o2, 1414252800
-          tz.transition 2015, 3, :o3, 1427558400
-          tz.transition 2015, 10, :o2, 1445702400
-          tz.transition 2016, 3, :o3, 1459008000
-          tz.transition 2016, 10, :o2, 1477756800
-          tz.transition 2017, 3, :o3, 1490457600
-          tz.transition 2017, 10, :o2, 1509206400
-          tz.transition 2018, 3, :o3, 1521907200
-          tz.transition 2018, 10, :o2, 1540656000
-          tz.transition 2019, 3, :o3, 1553961600
-          tz.transition 2019, 10, :o2, 1572105600
-          tz.transition 2020, 3, :o3, 1585411200
-          tz.transition 2020, 10, :o2, 1603555200
-          tz.transition 2021, 3, :o3, 1616860800
-          tz.transition 2021, 10, :o2, 1635609600
-          tz.transition 2022, 3, :o3, 1648310400
-          tz.transition 2022, 10, :o2, 1667059200
-          tz.transition 2023, 3, :o3, 1679760000
-          tz.transition 2023, 10, :o2, 1698508800
-          tz.transition 2024, 3, :o3, 1711814400
-          tz.transition 2024, 10, :o2, 1729958400
-          tz.transition 2025, 3, :o3, 1743264000
-          tz.transition 2025, 10, :o2, 1761408000
-          tz.transition 2026, 3, :o3, 1774713600
-          tz.transition 2026, 10, :o2, 1792857600
-          tz.transition 2027, 3, :o3, 1806163200
-          tz.transition 2027, 10, :o2, 1824912000
-          tz.transition 2028, 3, :o3, 1837612800
-          tz.transition 2028, 10, :o2, 1856361600
-          tz.transition 2029, 3, :o3, 1869062400
-          tz.transition 2029, 10, :o2, 1887811200
-          tz.transition 2030, 3, :o3, 1901116800
-          tz.transition 2030, 10, :o2, 1919260800
-          tz.transition 2031, 3, :o3, 1932566400
-          tz.transition 2031, 10, :o2, 1950710400
-          tz.transition 2032, 3, :o3, 1964016000
-          tz.transition 2032, 10, :o2, 1982764800
-          tz.transition 2033, 3, :o3, 1995465600
-          tz.transition 2033, 10, :o2, 2014214400
-          tz.transition 2034, 3, :o3, 2026915200
-          tz.transition 2034, 10, :o2, 2045664000
-          tz.transition 2035, 3, :o3, 2058364800
-          tz.transition 2035, 10, :o2, 2077113600
-          tz.transition 2036, 3, :o3, 2090419200
-          tz.transition 2036, 10, :o2, 2108563200
-          tz.transition 2037, 3, :o3, 2121868800
-          tz.transition 2037, 10, :o2, 2140012800
-          tz.transition 2038, 3, :o3, 14793061, 6
-          tz.transition 2038, 10, :o2, 14794363, 6
-          tz.transition 2039, 3, :o3, 14795245, 6
-          tz.transition 2039, 10, :o2, 14796547, 6
-          tz.transition 2040, 3, :o3, 14797429, 6
-          tz.transition 2040, 10, :o2, 14798731, 6
-          tz.transition 2041, 3, :o3, 14799655, 6
-          tz.transition 2041, 10, :o2, 14800915, 6
-          tz.transition 2042, 3, :o3, 14801839, 6
-          tz.transition 2042, 10, :o2, 14803099, 6
-          tz.transition 2043, 3, :o3, 14804023, 6
-          tz.transition 2043, 10, :o2, 14805283, 6
-          tz.transition 2044, 3, :o3, 14806207, 6
-          tz.transition 2044, 10, :o2, 14807509, 6
-          tz.transition 2045, 3, :o3, 14808391, 6
-          tz.transition 2045, 10, :o2, 14809693, 6
-          tz.transition 2046, 3, :o3, 14810575, 6
-          tz.transition 2046, 10, :o2, 14811877, 6
-          tz.transition 2047, 3, :o3, 14812801, 6
-          tz.transition 2047, 10, :o2, 14814061, 6
-          tz.transition 2048, 3, :o3, 14814985, 6
-          tz.transition 2048, 10, :o2, 14816245, 6
-          tz.transition 2049, 3, :o3, 14817169, 6
-          tz.transition 2049, 10, :o2, 14818471, 6
-          tz.transition 2050, 3, :o3, 14819353, 6
-          tz.transition 2050, 10, :o2, 14820655, 6
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yakutsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yakutsk.rb
deleted file mode 100644
index 56435a788f..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yakutsk.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Yakutsk
-        include TimezoneDefinition
-        
-        timezone 'Asia/Yakutsk' do |tz|
-          tz.offset :o0, 31120, 0, :LMT
-          tz.offset :o1, 28800, 0, :YAKT
-          tz.offset :o2, 32400, 0, :YAKT
-          tz.offset :o3, 32400, 3600, :YAKST
-          tz.offset :o4, 28800, 3600, :YAKST
-          
-          tz.transition 1919, 12, :o1, 2616091711, 1080
-          tz.transition 1930, 6, :o2, 14556889, 6
-          tz.transition 1981, 3, :o3, 354898800
-          tz.transition 1981, 9, :o2, 370706400
-          tz.transition 1982, 3, :o3, 386434800
-          tz.transition 1982, 9, :o2, 402242400
-          tz.transition 1983, 3, :o3, 417970800
-          tz.transition 1983, 9, :o2, 433778400
-          tz.transition 1984, 3, :o3, 449593200
-          tz.transition 1984, 9, :o2, 465325200
-          tz.transition 1985, 3, :o3, 481050000
-          tz.transition 1985, 9, :o2, 496774800
-          tz.transition 1986, 3, :o3, 512499600
-          tz.transition 1986, 9, :o2, 528224400
-          tz.transition 1987, 3, :o3, 543949200
-          tz.transition 1987, 9, :o2, 559674000
-          tz.transition 1988, 3, :o3, 575398800
-          tz.transition 1988, 9, :o2, 591123600
-          tz.transition 1989, 3, :o3, 606848400
-          tz.transition 1989, 9, :o2, 622573200
-          tz.transition 1990, 3, :o3, 638298000
-          tz.transition 1990, 9, :o2, 654627600
-          tz.transition 1991, 3, :o4, 670352400
-          tz.transition 1991, 9, :o1, 686080800
-          tz.transition 1992, 1, :o2, 695757600
-          tz.transition 1992, 3, :o3, 701791200
-          tz.transition 1992, 9, :o2, 717512400
-          tz.transition 1993, 3, :o3, 733251600
-          tz.transition 1993, 9, :o2, 748976400
-          tz.transition 1994, 3, :o3, 764701200
-          tz.transition 1994, 9, :o2, 780426000
-          tz.transition 1995, 3, :o3, 796150800
-          tz.transition 1995, 9, :o2, 811875600
-          tz.transition 1996, 3, :o3, 828205200
-          tz.transition 1996, 10, :o2, 846349200
-          tz.transition 1997, 3, :o3, 859654800
-          tz.transition 1997, 10, :o2, 877798800
-          tz.transition 1998, 3, :o3, 891104400
-          tz.transition 1998, 10, :o2, 909248400
-          tz.transition 1999, 3, :o3, 922554000
-          tz.transition 1999, 10, :o2, 941302800
-          tz.transition 2000, 3, :o3, 954003600
-          tz.transition 2000, 10, :o2, 972752400
-          tz.transition 2001, 3, :o3, 985453200
-          tz.transition 2001, 10, :o2, 1004202000
-          tz.transition 2002, 3, :o3, 1017507600
-          tz.transition 2002, 10, :o2, 1035651600
-          tz.transition 2003, 3, :o3, 1048957200
-          tz.transition 2003, 10, :o2, 1067101200
-          tz.transition 2004, 3, :o3, 1080406800
-          tz.transition 2004, 10, :o2, 1099155600
-          tz.transition 2005, 3, :o3, 1111856400
-          tz.transition 2005, 10, :o2, 1130605200
-          tz.transition 2006, 3, :o3, 1143306000
-          tz.transition 2006, 10, :o2, 1162054800
-          tz.transition 2007, 3, :o3, 1174755600
-          tz.transition 2007, 10, :o2, 1193504400
-          tz.transition 2008, 3, :o3, 1206810000
-          tz.transition 2008, 10, :o2, 1224954000
-          tz.transition 2009, 3, :o3, 1238259600
-          tz.transition 2009, 10, :o2, 1256403600
-          tz.transition 2010, 3, :o3, 1269709200
-          tz.transition 2010, 10, :o2, 1288458000
-          tz.transition 2011, 3, :o3, 1301158800
-          tz.transition 2011, 10, :o2, 1319907600
-          tz.transition 2012, 3, :o3, 1332608400
-          tz.transition 2012, 10, :o2, 1351357200
-          tz.transition 2013, 3, :o3, 1364662800
-          tz.transition 2013, 10, :o2, 1382806800
-          tz.transition 2014, 3, :o3, 1396112400
-          tz.transition 2014, 10, :o2, 1414256400
-          tz.transition 2015, 3, :o3, 1427562000
-          tz.transition 2015, 10, :o2, 1445706000
-          tz.transition 2016, 3, :o3, 1459011600
-          tz.transition 2016, 10, :o2, 1477760400
-          tz.transition 2017, 3, :o3, 1490461200
-          tz.transition 2017, 10, :o2, 1509210000
-          tz.transition 2018, 3, :o3, 1521910800
-          tz.transition 2018, 10, :o2, 1540659600
-          tz.transition 2019, 3, :o3, 1553965200
-          tz.transition 2019, 10, :o2, 1572109200
-          tz.transition 2020, 3, :o3, 1585414800
-          tz.transition 2020, 10, :o2, 1603558800
-          tz.transition 2021, 3, :o3, 1616864400
-          tz.transition 2021, 10, :o2, 1635613200
-          tz.transition 2022, 3, :o3, 1648314000
-          tz.transition 2022, 10, :o2, 1667062800
-          tz.transition 2023, 3, :o3, 1679763600
-          tz.transition 2023, 10, :o2, 1698512400
-          tz.transition 2024, 3, :o3, 1711818000
-          tz.transition 2024, 10, :o2, 1729962000
-          tz.transition 2025, 3, :o3, 1743267600
-          tz.transition 2025, 10, :o2, 1761411600
-          tz.transition 2026, 3, :o3, 1774717200
-          tz.transition 2026, 10, :o2, 1792861200
-          tz.transition 2027, 3, :o3, 1806166800
-          tz.transition 2027, 10, :o2, 1824915600
-          tz.transition 2028, 3, :o3, 1837616400
-          tz.transition 2028, 10, :o2, 1856365200
-          tz.transition 2029, 3, :o3, 1869066000
-          tz.transition 2029, 10, :o2, 1887814800
-          tz.transition 2030, 3, :o3, 1901120400
-          tz.transition 2030, 10, :o2, 1919264400
-          tz.transition 2031, 3, :o3, 1932570000
-          tz.transition 2031, 10, :o2, 1950714000
-          tz.transition 2032, 3, :o3, 1964019600
-          tz.transition 2032, 10, :o2, 1982768400
-          tz.transition 2033, 3, :o3, 1995469200
-          tz.transition 2033, 10, :o2, 2014218000
-          tz.transition 2034, 3, :o3, 2026918800
-          tz.transition 2034, 10, :o2, 2045667600
-          tz.transition 2035, 3, :o3, 2058368400
-          tz.transition 2035, 10, :o2, 2077117200
-          tz.transition 2036, 3, :o3, 2090422800
-          tz.transition 2036, 10, :o2, 2108566800
-          tz.transition 2037, 3, :o3, 2121872400
-          tz.transition 2037, 10, :o2, 2140016400
-          tz.transition 2038, 3, :o3, 59172245, 24
-          tz.transition 2038, 10, :o2, 59177453, 24
-          tz.transition 2039, 3, :o3, 59180981, 24
-          tz.transition 2039, 10, :o2, 59186189, 24
-          tz.transition 2040, 3, :o3, 59189717, 24
-          tz.transition 2040, 10, :o2, 59194925, 24
-          tz.transition 2041, 3, :o3, 59198621, 24
-          tz.transition 2041, 10, :o2, 59203661, 24
-          tz.transition 2042, 3, :o3, 59207357, 24
-          tz.transition 2042, 10, :o2, 59212397, 24
-          tz.transition 2043, 3, :o3, 59216093, 24
-          tz.transition 2043, 10, :o2, 59221133, 24
-          tz.transition 2044, 3, :o3, 59224829, 24
-          tz.transition 2044, 10, :o2, 59230037, 24
-          tz.transition 2045, 3, :o3, 59233565, 24
-          tz.transition 2045, 10, :o2, 59238773, 24
-          tz.transition 2046, 3, :o3, 59242301, 24
-          tz.transition 2046, 10, :o2, 59247509, 24
-          tz.transition 2047, 3, :o3, 59251205, 24
-          tz.transition 2047, 10, :o2, 59256245, 24
-          tz.transition 2048, 3, :o3, 59259941, 24
-          tz.transition 2048, 10, :o2, 59264981, 24
-          tz.transition 2049, 3, :o3, 59268677, 24
-          tz.transition 2049, 10, :o2, 59273885, 24
-          tz.transition 2050, 3, :o3, 59277413, 24
-          tz.transition 2050, 10, :o2, 59282621, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yekaterinburg.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yekaterinburg.rb
deleted file mode 100644
index 8ef8df4a41..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yekaterinburg.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Yekaterinburg
-        include TimezoneDefinition
-        
-        timezone 'Asia/Yekaterinburg' do |tz|
-          tz.offset :o0, 14544, 0, :LMT
-          tz.offset :o1, 14400, 0, :SVET
-          tz.offset :o2, 18000, 0, :SVET
-          tz.offset :o3, 18000, 3600, :SVEST
-          tz.offset :o4, 14400, 3600, :SVEST
-          tz.offset :o5, 18000, 0, :YEKT
-          tz.offset :o6, 18000, 3600, :YEKST
-          
-          tz.transition 1919, 7, :o1, 1453292699, 600
-          tz.transition 1930, 6, :o2, 7278445, 3
-          tz.transition 1981, 3, :o3, 354913200
-          tz.transition 1981, 9, :o2, 370720800
-          tz.transition 1982, 3, :o3, 386449200
-          tz.transition 1982, 9, :o2, 402256800
-          tz.transition 1983, 3, :o3, 417985200
-          tz.transition 1983, 9, :o2, 433792800
-          tz.transition 1984, 3, :o3, 449607600
-          tz.transition 1984, 9, :o2, 465339600
-          tz.transition 1985, 3, :o3, 481064400
-          tz.transition 1985, 9, :o2, 496789200
-          tz.transition 1986, 3, :o3, 512514000
-          tz.transition 1986, 9, :o2, 528238800
-          tz.transition 1987, 3, :o3, 543963600
-          tz.transition 1987, 9, :o2, 559688400
-          tz.transition 1988, 3, :o3, 575413200
-          tz.transition 1988, 9, :o2, 591138000
-          tz.transition 1989, 3, :o3, 606862800
-          tz.transition 1989, 9, :o2, 622587600
-          tz.transition 1990, 3, :o3, 638312400
-          tz.transition 1990, 9, :o2, 654642000
-          tz.transition 1991, 3, :o4, 670366800
-          tz.transition 1991, 9, :o1, 686095200
-          tz.transition 1992, 1, :o5, 695772000
-          tz.transition 1992, 3, :o6, 701805600
-          tz.transition 1992, 9, :o5, 717526800
-          tz.transition 1993, 3, :o6, 733266000
-          tz.transition 1993, 9, :o5, 748990800
-          tz.transition 1994, 3, :o6, 764715600
-          tz.transition 1994, 9, :o5, 780440400
-          tz.transition 1995, 3, :o6, 796165200
-          tz.transition 1995, 9, :o5, 811890000
-          tz.transition 1996, 3, :o6, 828219600
-          tz.transition 1996, 10, :o5, 846363600
-          tz.transition 1997, 3, :o6, 859669200
-          tz.transition 1997, 10, :o5, 877813200
-          tz.transition 1998, 3, :o6, 891118800
-          tz.transition 1998, 10, :o5, 909262800
-          tz.transition 1999, 3, :o6, 922568400
-          tz.transition 1999, 10, :o5, 941317200
-          tz.transition 2000, 3, :o6, 954018000
-          tz.transition 2000, 10, :o5, 972766800
-          tz.transition 2001, 3, :o6, 985467600
-          tz.transition 2001, 10, :o5, 1004216400
-          tz.transition 2002, 3, :o6, 1017522000
-          tz.transition 2002, 10, :o5, 1035666000
-          tz.transition 2003, 3, :o6, 1048971600
-          tz.transition 2003, 10, :o5, 1067115600
-          tz.transition 2004, 3, :o6, 1080421200
-          tz.transition 2004, 10, :o5, 1099170000
-          tz.transition 2005, 3, :o6, 1111870800
-          tz.transition 2005, 10, :o5, 1130619600
-          tz.transition 2006, 3, :o6, 1143320400
-          tz.transition 2006, 10, :o5, 1162069200
-          tz.transition 2007, 3, :o6, 1174770000
-          tz.transition 2007, 10, :o5, 1193518800
-          tz.transition 2008, 3, :o6, 1206824400
-          tz.transition 2008, 10, :o5, 1224968400
-          tz.transition 2009, 3, :o6, 1238274000
-          tz.transition 2009, 10, :o5, 1256418000
-          tz.transition 2010, 3, :o6, 1269723600
-          tz.transition 2010, 10, :o5, 1288472400
-          tz.transition 2011, 3, :o6, 1301173200
-          tz.transition 2011, 10, :o5, 1319922000
-          tz.transition 2012, 3, :o6, 1332622800
-          tz.transition 2012, 10, :o5, 1351371600
-          tz.transition 2013, 3, :o6, 1364677200
-          tz.transition 2013, 10, :o5, 1382821200
-          tz.transition 2014, 3, :o6, 1396126800
-          tz.transition 2014, 10, :o5, 1414270800
-          tz.transition 2015, 3, :o6, 1427576400
-          tz.transition 2015, 10, :o5, 1445720400
-          tz.transition 2016, 3, :o6, 1459026000
-          tz.transition 2016, 10, :o5, 1477774800
-          tz.transition 2017, 3, :o6, 1490475600
-          tz.transition 2017, 10, :o5, 1509224400
-          tz.transition 2018, 3, :o6, 1521925200
-          tz.transition 2018, 10, :o5, 1540674000
-          tz.transition 2019, 3, :o6, 1553979600
-          tz.transition 2019, 10, :o5, 1572123600
-          tz.transition 2020, 3, :o6, 1585429200
-          tz.transition 2020, 10, :o5, 1603573200
-          tz.transition 2021, 3, :o6, 1616878800
-          tz.transition 2021, 10, :o5, 1635627600
-          tz.transition 2022, 3, :o6, 1648328400
-          tz.transition 2022, 10, :o5, 1667077200
-          tz.transition 2023, 3, :o6, 1679778000
-          tz.transition 2023, 10, :o5, 1698526800
-          tz.transition 2024, 3, :o6, 1711832400
-          tz.transition 2024, 10, :o5, 1729976400
-          tz.transition 2025, 3, :o6, 1743282000
-          tz.transition 2025, 10, :o5, 1761426000
-          tz.transition 2026, 3, :o6, 1774731600
-          tz.transition 2026, 10, :o5, 1792875600
-          tz.transition 2027, 3, :o6, 1806181200
-          tz.transition 2027, 10, :o5, 1824930000
-          tz.transition 2028, 3, :o6, 1837630800
-          tz.transition 2028, 10, :o5, 1856379600
-          tz.transition 2029, 3, :o6, 1869080400
-          tz.transition 2029, 10, :o5, 1887829200
-          tz.transition 2030, 3, :o6, 1901134800
-          tz.transition 2030, 10, :o5, 1919278800
-          tz.transition 2031, 3, :o6, 1932584400
-          tz.transition 2031, 10, :o5, 1950728400
-          tz.transition 2032, 3, :o6, 1964034000
-          tz.transition 2032, 10, :o5, 1982782800
-          tz.transition 2033, 3, :o6, 1995483600
-          tz.transition 2033, 10, :o5, 2014232400
-          tz.transition 2034, 3, :o6, 2026933200
-          tz.transition 2034, 10, :o5, 2045682000
-          tz.transition 2035, 3, :o6, 2058382800
-          tz.transition 2035, 10, :o5, 2077131600
-          tz.transition 2036, 3, :o6, 2090437200
-          tz.transition 2036, 10, :o5, 2108581200
-          tz.transition 2037, 3, :o6, 2121886800
-          tz.transition 2037, 10, :o5, 2140030800
-          tz.transition 2038, 3, :o6, 19724083, 8
-          tz.transition 2038, 10, :o5, 19725819, 8
-          tz.transition 2039, 3, :o6, 19726995, 8
-          tz.transition 2039, 10, :o5, 19728731, 8
-          tz.transition 2040, 3, :o6, 19729907, 8
-          tz.transition 2040, 10, :o5, 19731643, 8
-          tz.transition 2041, 3, :o6, 19732875, 8
-          tz.transition 2041, 10, :o5, 19734555, 8
-          tz.transition 2042, 3, :o6, 19735787, 8
-          tz.transition 2042, 10, :o5, 19737467, 8
-          tz.transition 2043, 3, :o6, 19738699, 8
-          tz.transition 2043, 10, :o5, 19740379, 8
-          tz.transition 2044, 3, :o6, 19741611, 8
-          tz.transition 2044, 10, :o5, 19743347, 8
-          tz.transition 2045, 3, :o6, 19744523, 8
-          tz.transition 2045, 10, :o5, 19746259, 8
-          tz.transition 2046, 3, :o6, 19747435, 8
-          tz.transition 2046, 10, :o5, 19749171, 8
-          tz.transition 2047, 3, :o6, 19750403, 8
-          tz.transition 2047, 10, :o5, 19752083, 8
-          tz.transition 2048, 3, :o6, 19753315, 8
-          tz.transition 2048, 10, :o5, 19754995, 8
-          tz.transition 2049, 3, :o6, 19756227, 8
-          tz.transition 2049, 10, :o5, 19757963, 8
-          tz.transition 2050, 3, :o6, 19759139, 8
-          tz.transition 2050, 10, :o5, 19760875, 8
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yerevan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yerevan.rb
deleted file mode 100644
index e7f160861f..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yerevan.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Asia
-      module Yerevan
-        include TimezoneDefinition
-        
-        timezone 'Asia/Yerevan' do |tz|
-          tz.offset :o0, 10680, 0, :LMT
-          tz.offset :o1, 10800, 0, :YERT
-          tz.offset :o2, 14400, 0, :YERT
-          tz.offset :o3, 14400, 3600, :YERST
-          tz.offset :o4, 10800, 3600, :YERST
-          tz.offset :o5, 10800, 3600, :AMST
-          tz.offset :o6, 10800, 0, :AMT
-          tz.offset :o7, 14400, 0, :AMT
-          tz.offset :o8, 14400, 3600, :AMST
-          
-          tz.transition 1924, 5, :o1, 1745213311, 720
-          tz.transition 1957, 2, :o2, 19487187, 8
-          tz.transition 1981, 3, :o3, 354916800
-          tz.transition 1981, 9, :o2, 370724400
-          tz.transition 1982, 3, :o3, 386452800
-          tz.transition 1982, 9, :o2, 402260400
-          tz.transition 1983, 3, :o3, 417988800
-          tz.transition 1983, 9, :o2, 433796400
-          tz.transition 1984, 3, :o3, 449611200
-          tz.transition 1984, 9, :o2, 465343200
-          tz.transition 1985, 3, :o3, 481068000
-          tz.transition 1985, 9, :o2, 496792800
-          tz.transition 1986, 3, :o3, 512517600
-          tz.transition 1986, 9, :o2, 528242400
-          tz.transition 1987, 3, :o3, 543967200
-          tz.transition 1987, 9, :o2, 559692000
-          tz.transition 1988, 3, :o3, 575416800
-          tz.transition 1988, 9, :o2, 591141600
-          tz.transition 1989, 3, :o3, 606866400
-          tz.transition 1989, 9, :o2, 622591200
-          tz.transition 1990, 3, :o3, 638316000
-          tz.transition 1990, 9, :o2, 654645600
-          tz.transition 1991, 3, :o4, 670370400
-          tz.transition 1991, 9, :o5, 685569600
-          tz.transition 1991, 9, :o6, 686098800
-          tz.transition 1992, 3, :o5, 701812800
-          tz.transition 1992, 9, :o6, 717534000
-          tz.transition 1993, 3, :o5, 733273200
-          tz.transition 1993, 9, :o6, 748998000
-          tz.transition 1994, 3, :o5, 764722800
-          tz.transition 1994, 9, :o6, 780447600
-          tz.transition 1995, 3, :o5, 796172400
-          tz.transition 1995, 9, :o7, 811897200
-          tz.transition 1997, 3, :o8, 859672800
-          tz.transition 1997, 10, :o7, 877816800
-          tz.transition 1998, 3, :o8, 891122400
-          tz.transition 1998, 10, :o7, 909266400
-          tz.transition 1999, 3, :o8, 922572000
-          tz.transition 1999, 10, :o7, 941320800
-          tz.transition 2000, 3, :o8, 954021600
-          tz.transition 2000, 10, :o7, 972770400
-          tz.transition 2001, 3, :o8, 985471200
-          tz.transition 2001, 10, :o7, 1004220000
-          tz.transition 2002, 3, :o8, 1017525600
-          tz.transition 2002, 10, :o7, 1035669600
-          tz.transition 2003, 3, :o8, 1048975200
-          tz.transition 2003, 10, :o7, 1067119200
-          tz.transition 2004, 3, :o8, 1080424800
-          tz.transition 2004, 10, :o7, 1099173600
-          tz.transition 2005, 3, :o8, 1111874400
-          tz.transition 2005, 10, :o7, 1130623200
-          tz.transition 2006, 3, :o8, 1143324000
-          tz.transition 2006, 10, :o7, 1162072800
-          tz.transition 2007, 3, :o8, 1174773600
-          tz.transition 2007, 10, :o7, 1193522400
-          tz.transition 2008, 3, :o8, 1206828000
-          tz.transition 2008, 10, :o7, 1224972000
-          tz.transition 2009, 3, :o8, 1238277600
-          tz.transition 2009, 10, :o7, 1256421600
-          tz.transition 2010, 3, :o8, 1269727200
-          tz.transition 2010, 10, :o7, 1288476000
-          tz.transition 2011, 3, :o8, 1301176800
-          tz.transition 2011, 10, :o7, 1319925600
-          tz.transition 2012, 3, :o8, 1332626400
-          tz.transition 2012, 10, :o7, 1351375200
-          tz.transition 2013, 3, :o8, 1364680800
-          tz.transition 2013, 10, :o7, 1382824800
-          tz.transition 2014, 3, :o8, 1396130400
-          tz.transition 2014, 10, :o7, 1414274400
-          tz.transition 2015, 3, :o8, 1427580000
-          tz.transition 2015, 10, :o7, 1445724000
-          tz.transition 2016, 3, :o8, 1459029600
-          tz.transition 2016, 10, :o7, 1477778400
-          tz.transition 2017, 3, :o8, 1490479200
-          tz.transition 2017, 10, :o7, 1509228000
-          tz.transition 2018, 3, :o8, 1521928800
-          tz.transition 2018, 10, :o7, 1540677600
-          tz.transition 2019, 3, :o8, 1553983200
-          tz.transition 2019, 10, :o7, 1572127200
-          tz.transition 2020, 3, :o8, 1585432800
-          tz.transition 2020, 10, :o7, 1603576800
-          tz.transition 2021, 3, :o8, 1616882400
-          tz.transition 2021, 10, :o7, 1635631200
-          tz.transition 2022, 3, :o8, 1648332000
-          tz.transition 2022, 10, :o7, 1667080800
-          tz.transition 2023, 3, :o8, 1679781600
-          tz.transition 2023, 10, :o7, 1698530400
-          tz.transition 2024, 3, :o8, 1711836000
-          tz.transition 2024, 10, :o7, 1729980000
-          tz.transition 2025, 3, :o8, 1743285600
-          tz.transition 2025, 10, :o7, 1761429600
-          tz.transition 2026, 3, :o8, 1774735200
-          tz.transition 2026, 10, :o7, 1792879200
-          tz.transition 2027, 3, :o8, 1806184800
-          tz.transition 2027, 10, :o7, 1824933600
-          tz.transition 2028, 3, :o8, 1837634400
-          tz.transition 2028, 10, :o7, 1856383200
-          tz.transition 2029, 3, :o8, 1869084000
-          tz.transition 2029, 10, :o7, 1887832800
-          tz.transition 2030, 3, :o8, 1901138400
-          tz.transition 2030, 10, :o7, 1919282400
-          tz.transition 2031, 3, :o8, 1932588000
-          tz.transition 2031, 10, :o7, 1950732000
-          tz.transition 2032, 3, :o8, 1964037600
-          tz.transition 2032, 10, :o7, 1982786400
-          tz.transition 2033, 3, :o8, 1995487200
-          tz.transition 2033, 10, :o7, 2014236000
-          tz.transition 2034, 3, :o8, 2026936800
-          tz.transition 2034, 10, :o7, 2045685600
-          tz.transition 2035, 3, :o8, 2058386400
-          tz.transition 2035, 10, :o7, 2077135200
-          tz.transition 2036, 3, :o8, 2090440800
-          tz.transition 2036, 10, :o7, 2108584800
-          tz.transition 2037, 3, :o8, 2121890400
-          tz.transition 2037, 10, :o7, 2140034400
-          tz.transition 2038, 3, :o8, 29586125, 12
-          tz.transition 2038, 10, :o7, 29588729, 12
-          tz.transition 2039, 3, :o8, 29590493, 12
-          tz.transition 2039, 10, :o7, 29593097, 12
-          tz.transition 2040, 3, :o8, 29594861, 12
-          tz.transition 2040, 10, :o7, 29597465, 12
-          tz.transition 2041, 3, :o8, 29599313, 12
-          tz.transition 2041, 10, :o7, 29601833, 12
-          tz.transition 2042, 3, :o8, 29603681, 12
-          tz.transition 2042, 10, :o7, 29606201, 12
-          tz.transition 2043, 3, :o8, 29608049, 12
-          tz.transition 2043, 10, :o7, 29610569, 12
-          tz.transition 2044, 3, :o8, 29612417, 12
-          tz.transition 2044, 10, :o7, 29615021, 12
-          tz.transition 2045, 3, :o8, 29616785, 12
-          tz.transition 2045, 10, :o7, 29619389, 12
-          tz.transition 2046, 3, :o8, 29621153, 12
-          tz.transition 2046, 10, :o7, 29623757, 12
-          tz.transition 2047, 3, :o8, 29625605, 12
-          tz.transition 2047, 10, :o7, 29628125, 12
-          tz.transition 2048, 3, :o8, 29629973, 12
-          tz.transition 2048, 10, :o7, 29632493, 12
-          tz.transition 2049, 3, :o8, 29634341, 12
-          tz.transition 2049, 10, :o7, 29636945, 12
-          tz.transition 2050, 3, :o8, 29638709, 12
-          tz.transition 2050, 10, :o7, 29641313, 12
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/Azores.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/Azores.rb
deleted file mode 100644
index 1bd16a75ac..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/Azores.rb
+++ /dev/null
@@ -1,270 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module Azores
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/Azores' do |tz|
-          tz.offset :o0, -6160, 0, :LMT
-          tz.offset :o1, -6872, 0, :HMT
-          tz.offset :o2, -7200, 0, :AZOT
-          tz.offset :o3, -7200, 3600, :AZOST
-          tz.offset :o4, -7200, 7200, :AZOMT
-          tz.offset :o5, -3600, 0, :AZOT
-          tz.offset :o6, -3600, 3600, :AZOST
-          tz.offset :o7, 0, 0, :WET
-          
-          tz.transition 1884, 1, :o1, 2601910697, 1080
-          tz.transition 1911, 5, :o2, 26127150259, 10800
-          tz.transition 1916, 6, :o3, 58104781, 24
-          tz.transition 1916, 11, :o2, 29054023, 12
-          tz.transition 1917, 3, :o3, 58110925, 24
-          tz.transition 1917, 10, :o2, 58116397, 24
-          tz.transition 1918, 3, :o3, 58119709, 24
-          tz.transition 1918, 10, :o2, 58125157, 24
-          tz.transition 1919, 3, :o3, 58128445, 24
-          tz.transition 1919, 10, :o2, 58133917, 24
-          tz.transition 1920, 3, :o3, 58137229, 24
-          tz.transition 1920, 10, :o2, 58142701, 24
-          tz.transition 1921, 3, :o3, 58145989, 24
-          tz.transition 1921, 10, :o2, 58151461, 24
-          tz.transition 1924, 4, :o3, 58173421, 24
-          tz.transition 1924, 10, :o2, 58177765, 24
-          tz.transition 1926, 4, :o3, 58190965, 24
-          tz.transition 1926, 10, :o2, 58194997, 24
-          tz.transition 1927, 4, :o3, 58199533, 24
-          tz.transition 1927, 10, :o2, 58203733, 24
-          tz.transition 1928, 4, :o3, 58208437, 24
-          tz.transition 1928, 10, :o2, 58212637, 24
-          tz.transition 1929, 4, :o3, 58217341, 24
-          tz.transition 1929, 10, :o2, 58221373, 24
-          tz.transition 1931, 4, :o3, 58234813, 24
-          tz.transition 1931, 10, :o2, 58238845, 24
-          tz.transition 1932, 4, :o3, 58243213, 24
-          tz.transition 1932, 10, :o2, 58247581, 24
-          tz.transition 1934, 4, :o3, 58260853, 24
-          tz.transition 1934, 10, :o2, 58265221, 24
-          tz.transition 1935, 3, :o3, 58269421, 24
-          tz.transition 1935, 10, :o2, 58273957, 24
-          tz.transition 1936, 4, :o3, 58278661, 24
-          tz.transition 1936, 10, :o2, 58282693, 24
-          tz.transition 1937, 4, :o3, 58287061, 24
-          tz.transition 1937, 10, :o2, 58291429, 24
-          tz.transition 1938, 3, :o3, 58295629, 24
-          tz.transition 1938, 10, :o2, 58300165, 24
-          tz.transition 1939, 4, :o3, 58304869, 24
-          tz.transition 1939, 11, :o2, 58310077, 24
-          tz.transition 1940, 2, :o3, 58312429, 24
-          tz.transition 1940, 10, :o2, 58317805, 24
-          tz.transition 1941, 4, :o3, 58322173, 24
-          tz.transition 1941, 10, :o2, 58326565, 24
-          tz.transition 1942, 3, :o3, 58330405, 24
-          tz.transition 1942, 4, :o4, 4860951, 2
-          tz.transition 1942, 8, :o3, 4861175, 2
-          tz.transition 1942, 10, :o2, 58335781, 24
-          tz.transition 1943, 3, :o3, 58339141, 24
-          tz.transition 1943, 4, :o4, 4861665, 2
-          tz.transition 1943, 8, :o3, 4861931, 2
-          tz.transition 1943, 10, :o2, 58344685, 24
-          tz.transition 1944, 3, :o3, 58347877, 24
-          tz.transition 1944, 4, :o4, 4862407, 2
-          tz.transition 1944, 8, :o3, 4862659, 2
-          tz.transition 1944, 10, :o2, 58353421, 24
-          tz.transition 1945, 3, :o3, 58356613, 24
-          tz.transition 1945, 4, :o4, 4863135, 2
-          tz.transition 1945, 8, :o3, 4863387, 2
-          tz.transition 1945, 10, :o2, 58362157, 24
-          tz.transition 1946, 4, :o3, 58366021, 24
-          tz.transition 1946, 10, :o2, 58370389, 24
-          tz.transition 1947, 4, :o3, 7296845, 3
-          tz.transition 1947, 10, :o2, 7297391, 3
-          tz.transition 1948, 4, :o3, 7297937, 3
-          tz.transition 1948, 10, :o2, 7298483, 3
-          tz.transition 1949, 4, :o3, 7299029, 3
-          tz.transition 1949, 10, :o2, 7299575, 3
-          tz.transition 1951, 4, :o3, 7301213, 3
-          tz.transition 1951, 10, :o2, 7301780, 3
-          tz.transition 1952, 4, :o3, 7302326, 3
-          tz.transition 1952, 10, :o2, 7302872, 3
-          tz.transition 1953, 4, :o3, 7303418, 3
-          tz.transition 1953, 10, :o2, 7303964, 3
-          tz.transition 1954, 4, :o3, 7304510, 3
-          tz.transition 1954, 10, :o2, 7305056, 3
-          tz.transition 1955, 4, :o3, 7305602, 3
-          tz.transition 1955, 10, :o2, 7306148, 3
-          tz.transition 1956, 4, :o3, 7306694, 3
-          tz.transition 1956, 10, :o2, 7307261, 3
-          tz.transition 1957, 4, :o3, 7307807, 3
-          tz.transition 1957, 10, :o2, 7308353, 3
-          tz.transition 1958, 4, :o3, 7308899, 3
-          tz.transition 1958, 10, :o2, 7309445, 3
-          tz.transition 1959, 4, :o3, 7309991, 3
-          tz.transition 1959, 10, :o2, 7310537, 3
-          tz.transition 1960, 4, :o3, 7311083, 3
-          tz.transition 1960, 10, :o2, 7311629, 3
-          tz.transition 1961, 4, :o3, 7312175, 3
-          tz.transition 1961, 10, :o2, 7312721, 3
-          tz.transition 1962, 4, :o3, 7313267, 3
-          tz.transition 1962, 10, :o2, 7313834, 3
-          tz.transition 1963, 4, :o3, 7314380, 3
-          tz.transition 1963, 10, :o2, 7314926, 3
-          tz.transition 1964, 4, :o3, 7315472, 3
-          tz.transition 1964, 10, :o2, 7316018, 3
-          tz.transition 1965, 4, :o3, 7316564, 3
-          tz.transition 1965, 10, :o2, 7317110, 3
-          tz.transition 1966, 4, :o5, 7317656, 3
-          tz.transition 1977, 3, :o6, 228272400
-          tz.transition 1977, 9, :o5, 243997200
-          tz.transition 1978, 4, :o6, 260326800
-          tz.transition 1978, 10, :o5, 276051600
-          tz.transition 1979, 4, :o6, 291776400
-          tz.transition 1979, 9, :o5, 307504800
-          tz.transition 1980, 3, :o6, 323226000
-          tz.transition 1980, 9, :o5, 338954400
-          tz.transition 1981, 3, :o6, 354679200
-          tz.transition 1981, 9, :o5, 370404000
-          tz.transition 1982, 3, :o6, 386128800
-          tz.transition 1982, 9, :o5, 401853600
-          tz.transition 1983, 3, :o6, 417582000
-          tz.transition 1983, 9, :o5, 433303200
-          tz.transition 1984, 3, :o6, 449028000
-          tz.transition 1984, 9, :o5, 465357600
-          tz.transition 1985, 3, :o6, 481082400
-          tz.transition 1985, 9, :o5, 496807200
-          tz.transition 1986, 3, :o6, 512532000
-          tz.transition 1986, 9, :o5, 528256800
-          tz.transition 1987, 3, :o6, 543981600
-          tz.transition 1987, 9, :o5, 559706400
-          tz.transition 1988, 3, :o6, 575431200
-          tz.transition 1988, 9, :o5, 591156000
-          tz.transition 1989, 3, :o6, 606880800
-          tz.transition 1989, 9, :o5, 622605600
-          tz.transition 1990, 3, :o6, 638330400
-          tz.transition 1990, 9, :o5, 654660000
-          tz.transition 1991, 3, :o6, 670384800
-          tz.transition 1991, 9, :o5, 686109600
-          tz.transition 1992, 3, :o6, 701834400
-          tz.transition 1992, 9, :o7, 717559200
-          tz.transition 1993, 3, :o6, 733280400
-          tz.transition 1993, 9, :o5, 749005200
-          tz.transition 1994, 3, :o6, 764730000
-          tz.transition 1994, 9, :o5, 780454800
-          tz.transition 1995, 3, :o6, 796179600
-          tz.transition 1995, 9, :o5, 811904400
-          tz.transition 1996, 3, :o6, 828234000
-          tz.transition 1996, 10, :o5, 846378000
-          tz.transition 1997, 3, :o6, 859683600
-          tz.transition 1997, 10, :o5, 877827600
-          tz.transition 1998, 3, :o6, 891133200
-          tz.transition 1998, 10, :o5, 909277200
-          tz.transition 1999, 3, :o6, 922582800
-          tz.transition 1999, 10, :o5, 941331600
-          tz.transition 2000, 3, :o6, 954032400
-          tz.transition 2000, 10, :o5, 972781200
-          tz.transition 2001, 3, :o6, 985482000
-          tz.transition 2001, 10, :o5, 1004230800
-          tz.transition 2002, 3, :o6, 1017536400
-          tz.transition 2002, 10, :o5, 1035680400
-          tz.transition 2003, 3, :o6, 1048986000
-          tz.transition 2003, 10, :o5, 1067130000
-          tz.transition 2004, 3, :o6, 1080435600
-          tz.transition 2004, 10, :o5, 1099184400
-          tz.transition 2005, 3, :o6, 1111885200
-          tz.transition 2005, 10, :o5, 1130634000
-          tz.transition 2006, 3, :o6, 1143334800
-          tz.transition 2006, 10, :o5, 1162083600
-          tz.transition 2007, 3, :o6, 1174784400
-          tz.transition 2007, 10, :o5, 1193533200
-          tz.transition 2008, 3, :o6, 1206838800
-          tz.transition 2008, 10, :o5, 1224982800
-          tz.transition 2009, 3, :o6, 1238288400
-          tz.transition 2009, 10, :o5, 1256432400
-          tz.transition 2010, 3, :o6, 1269738000
-          tz.transition 2010, 10, :o5, 1288486800
-          tz.transition 2011, 3, :o6, 1301187600
-          tz.transition 2011, 10, :o5, 1319936400
-          tz.transition 2012, 3, :o6, 1332637200
-          tz.transition 2012, 10, :o5, 1351386000
-          tz.transition 2013, 3, :o6, 1364691600
-          tz.transition 2013, 10, :o5, 1382835600
-          tz.transition 2014, 3, :o6, 1396141200
-          tz.transition 2014, 10, :o5, 1414285200
-          tz.transition 2015, 3, :o6, 1427590800
-          tz.transition 2015, 10, :o5, 1445734800
-          tz.transition 2016, 3, :o6, 1459040400
-          tz.transition 2016, 10, :o5, 1477789200
-          tz.transition 2017, 3, :o6, 1490490000
-          tz.transition 2017, 10, :o5, 1509238800
-          tz.transition 2018, 3, :o6, 1521939600
-          tz.transition 2018, 10, :o5, 1540688400
-          tz.transition 2019, 3, :o6, 1553994000
-          tz.transition 2019, 10, :o5, 1572138000
-          tz.transition 2020, 3, :o6, 1585443600
-          tz.transition 2020, 10, :o5, 1603587600
-          tz.transition 2021, 3, :o6, 1616893200
-          tz.transition 2021, 10, :o5, 1635642000
-          tz.transition 2022, 3, :o6, 1648342800
-          tz.transition 2022, 10, :o5, 1667091600
-          tz.transition 2023, 3, :o6, 1679792400
-          tz.transition 2023, 10, :o5, 1698541200
-          tz.transition 2024, 3, :o6, 1711846800
-          tz.transition 2024, 10, :o5, 1729990800
-          tz.transition 2025, 3, :o6, 1743296400
-          tz.transition 2025, 10, :o5, 1761440400
-          tz.transition 2026, 3, :o6, 1774746000
-          tz.transition 2026, 10, :o5, 1792890000
-          tz.transition 2027, 3, :o6, 1806195600
-          tz.transition 2027, 10, :o5, 1824944400
-          tz.transition 2028, 3, :o6, 1837645200
-          tz.transition 2028, 10, :o5, 1856394000
-          tz.transition 2029, 3, :o6, 1869094800
-          tz.transition 2029, 10, :o5, 1887843600
-          tz.transition 2030, 3, :o6, 1901149200
-          tz.transition 2030, 10, :o5, 1919293200
-          tz.transition 2031, 3, :o6, 1932598800
-          tz.transition 2031, 10, :o5, 1950742800
-          tz.transition 2032, 3, :o6, 1964048400
-          tz.transition 2032, 10, :o5, 1982797200
-          tz.transition 2033, 3, :o6, 1995498000
-          tz.transition 2033, 10, :o5, 2014246800
-          tz.transition 2034, 3, :o6, 2026947600
-          tz.transition 2034, 10, :o5, 2045696400
-          tz.transition 2035, 3, :o6, 2058397200
-          tz.transition 2035, 10, :o5, 2077146000
-          tz.transition 2036, 3, :o6, 2090451600
-          tz.transition 2036, 10, :o5, 2108595600
-          tz.transition 2037, 3, :o6, 2121901200
-          tz.transition 2037, 10, :o5, 2140045200
-          tz.transition 2038, 3, :o6, 59172253, 24
-          tz.transition 2038, 10, :o5, 59177461, 24
-          tz.transition 2039, 3, :o6, 59180989, 24
-          tz.transition 2039, 10, :o5, 59186197, 24
-          tz.transition 2040, 3, :o6, 59189725, 24
-          tz.transition 2040, 10, :o5, 59194933, 24
-          tz.transition 2041, 3, :o6, 59198629, 24
-          tz.transition 2041, 10, :o5, 59203669, 24
-          tz.transition 2042, 3, :o6, 59207365, 24
-          tz.transition 2042, 10, :o5, 59212405, 24
-          tz.transition 2043, 3, :o6, 59216101, 24
-          tz.transition 2043, 10, :o5, 59221141, 24
-          tz.transition 2044, 3, :o6, 59224837, 24
-          tz.transition 2044, 10, :o5, 59230045, 24
-          tz.transition 2045, 3, :o6, 59233573, 24
-          tz.transition 2045, 10, :o5, 59238781, 24
-          tz.transition 2046, 3, :o6, 59242309, 24
-          tz.transition 2046, 10, :o5, 59247517, 24
-          tz.transition 2047, 3, :o6, 59251213, 24
-          tz.transition 2047, 10, :o5, 59256253, 24
-          tz.transition 2048, 3, :o6, 59259949, 24
-          tz.transition 2048, 10, :o5, 59264989, 24
-          tz.transition 2049, 3, :o6, 59268685, 24
-          tz.transition 2049, 10, :o5, 59273893, 24
-          tz.transition 2050, 3, :o6, 59277421, 24
-          tz.transition 2050, 10, :o5, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb
deleted file mode 100644
index 61c8c15043..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module Cape_Verde
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/Cape_Verde' do |tz|
-          tz.offset :o0, -5644, 0, :LMT
-          tz.offset :o1, -7200, 0, :CVT
-          tz.offset :o2, -7200, 3600, :CVST
-          tz.offset :o3, -3600, 0, :CVT
-          
-          tz.transition 1907, 1, :o1, 52219653811, 21600
-          tz.transition 1942, 9, :o2, 29167243, 12
-          tz.transition 1945, 10, :o1, 58361845, 24
-          tz.transition 1975, 11, :o3, 186120000
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/South_Georgia.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/South_Georgia.rb
deleted file mode 100644
index 6a4cbafb9f..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/South_Georgia.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Atlantic
-      module South_Georgia
-        include TimezoneDefinition
-        
-        timezone 'Atlantic/South_Georgia' do |tz|
-          tz.offset :o0, -8768, 0, :LMT
-          tz.offset :o1, -7200, 0, :GST
-          
-          tz.transition 1890, 1, :o1, 1627673806, 675
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Adelaide.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Adelaide.rb
deleted file mode 100644
index c5d561cc1e..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Adelaide.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Adelaide
-        include TimezoneDefinition
-        
-        timezone 'Australia/Adelaide' do |tz|
-          tz.offset :o0, 33260, 0, :LMT
-          tz.offset :o1, 32400, 0, :CST
-          tz.offset :o2, 34200, 0, :CST
-          tz.offset :o3, 34200, 3600, :CST
-          
-          tz.transition 1895, 1, :o1, 10425132497, 4320
-          tz.transition 1899, 4, :o2, 19318201, 8
-          tz.transition 1916, 12, :o3, 3486569911, 1440
-          tz.transition 1917, 3, :o2, 116222983, 48
-          tz.transition 1941, 12, :o3, 38885763, 16
-          tz.transition 1942, 3, :o2, 116661463, 48
-          tz.transition 1942, 9, :o3, 38890067, 16
-          tz.transition 1943, 3, :o2, 116678935, 48
-          tz.transition 1943, 10, :o3, 38896003, 16
-          tz.transition 1944, 3, :o2, 116696407, 48
-          tz.transition 1971, 10, :o3, 57688200
-          tz.transition 1972, 2, :o2, 67969800
-          tz.transition 1972, 10, :o3, 89137800
-          tz.transition 1973, 3, :o2, 100024200
-          tz.transition 1973, 10, :o3, 120587400
-          tz.transition 1974, 3, :o2, 131473800
-          tz.transition 1974, 10, :o3, 152037000
-          tz.transition 1975, 3, :o2, 162923400
-          tz.transition 1975, 10, :o3, 183486600
-          tz.transition 1976, 3, :o2, 194977800
-          tz.transition 1976, 10, :o3, 215541000
-          tz.transition 1977, 3, :o2, 226427400
-          tz.transition 1977, 10, :o3, 246990600
-          tz.transition 1978, 3, :o2, 257877000
-          tz.transition 1978, 10, :o3, 278440200
-          tz.transition 1979, 3, :o2, 289326600
-          tz.transition 1979, 10, :o3, 309889800
-          tz.transition 1980, 3, :o2, 320776200
-          tz.transition 1980, 10, :o3, 341339400
-          tz.transition 1981, 2, :o2, 352225800
-          tz.transition 1981, 10, :o3, 372789000
-          tz.transition 1982, 3, :o2, 384280200
-          tz.transition 1982, 10, :o3, 404843400
-          tz.transition 1983, 3, :o2, 415729800
-          tz.transition 1983, 10, :o3, 436293000
-          tz.transition 1984, 3, :o2, 447179400
-          tz.transition 1984, 10, :o3, 467742600
-          tz.transition 1985, 3, :o2, 478629000
-          tz.transition 1985, 10, :o3, 499192200
-          tz.transition 1986, 3, :o2, 511288200
-          tz.transition 1986, 10, :o3, 530037000
-          tz.transition 1987, 3, :o2, 542737800
-          tz.transition 1987, 10, :o3, 562091400
-          tz.transition 1988, 3, :o2, 574792200
-          tz.transition 1988, 10, :o3, 594145800
-          tz.transition 1989, 3, :o2, 606241800
-          tz.transition 1989, 10, :o3, 625595400
-          tz.transition 1990, 3, :o2, 637691400
-          tz.transition 1990, 10, :o3, 657045000
-          tz.transition 1991, 3, :o2, 667931400
-          tz.transition 1991, 10, :o3, 688494600
-          tz.transition 1992, 3, :o2, 701195400
-          tz.transition 1992, 10, :o3, 719944200
-          tz.transition 1993, 3, :o2, 731435400
-          tz.transition 1993, 10, :o3, 751998600
-          tz.transition 1994, 3, :o2, 764094600
-          tz.transition 1994, 10, :o3, 783448200
-          tz.transition 1995, 3, :o2, 796149000
-          tz.transition 1995, 10, :o3, 814897800
-          tz.transition 1996, 3, :o2, 828203400
-          tz.transition 1996, 10, :o3, 846347400
-          tz.transition 1997, 3, :o2, 859653000
-          tz.transition 1997, 10, :o3, 877797000
-          tz.transition 1998, 3, :o2, 891102600
-          tz.transition 1998, 10, :o3, 909246600
-          tz.transition 1999, 3, :o2, 922552200
-          tz.transition 1999, 10, :o3, 941301000
-          tz.transition 2000, 3, :o2, 954001800
-          tz.transition 2000, 10, :o3, 972750600
-          tz.transition 2001, 3, :o2, 985451400
-          tz.transition 2001, 10, :o3, 1004200200
-          tz.transition 2002, 3, :o2, 1017505800
-          tz.transition 2002, 10, :o3, 1035649800
-          tz.transition 2003, 3, :o2, 1048955400
-          tz.transition 2003, 10, :o3, 1067099400
-          tz.transition 2004, 3, :o2, 1080405000
-          tz.transition 2004, 10, :o3, 1099153800
-          tz.transition 2005, 3, :o2, 1111854600
-          tz.transition 2005, 10, :o3, 1130603400
-          tz.transition 2006, 4, :o2, 1143909000
-          tz.transition 2006, 10, :o3, 1162053000
-          tz.transition 2007, 3, :o2, 1174753800
-          tz.transition 2007, 10, :o3, 1193502600
-          tz.transition 2008, 4, :o2, 1207413000
-          tz.transition 2008, 10, :o3, 1223137800
-          tz.transition 2009, 4, :o2, 1238862600
-          tz.transition 2009, 10, :o3, 1254587400
-          tz.transition 2010, 4, :o2, 1270312200
-          tz.transition 2010, 10, :o3, 1286037000
-          tz.transition 2011, 4, :o2, 1301761800
-          tz.transition 2011, 10, :o3, 1317486600
-          tz.transition 2012, 3, :o2, 1333211400
-          tz.transition 2012, 10, :o3, 1349541000
-          tz.transition 2013, 4, :o2, 1365265800
-          tz.transition 2013, 10, :o3, 1380990600
-          tz.transition 2014, 4, :o2, 1396715400
-          tz.transition 2014, 10, :o3, 1412440200
-          tz.transition 2015, 4, :o2, 1428165000
-          tz.transition 2015, 10, :o3, 1443889800
-          tz.transition 2016, 4, :o2, 1459614600
-          tz.transition 2016, 10, :o3, 1475339400
-          tz.transition 2017, 4, :o2, 1491064200
-          tz.transition 2017, 9, :o3, 1506789000
-          tz.transition 2018, 3, :o2, 1522513800
-          tz.transition 2018, 10, :o3, 1538843400
-          tz.transition 2019, 4, :o2, 1554568200
-          tz.transition 2019, 10, :o3, 1570293000
-          tz.transition 2020, 4, :o2, 1586017800
-          tz.transition 2020, 10, :o3, 1601742600
-          tz.transition 2021, 4, :o2, 1617467400
-          tz.transition 2021, 10, :o3, 1633192200
-          tz.transition 2022, 4, :o2, 1648917000
-          tz.transition 2022, 10, :o3, 1664641800
-          tz.transition 2023, 4, :o2, 1680366600
-          tz.transition 2023, 9, :o3, 1696091400
-          tz.transition 2024, 4, :o2, 1712421000
-          tz.transition 2024, 10, :o3, 1728145800
-          tz.transition 2025, 4, :o2, 1743870600
-          tz.transition 2025, 10, :o3, 1759595400
-          tz.transition 2026, 4, :o2, 1775320200
-          tz.transition 2026, 10, :o3, 1791045000
-          tz.transition 2027, 4, :o2, 1806769800
-          tz.transition 2027, 10, :o3, 1822494600
-          tz.transition 2028, 4, :o2, 1838219400
-          tz.transition 2028, 9, :o3, 1853944200
-          tz.transition 2029, 3, :o2, 1869669000
-          tz.transition 2029, 10, :o3, 1885998600
-          tz.transition 2030, 4, :o2, 1901723400
-          tz.transition 2030, 10, :o3, 1917448200
-          tz.transition 2031, 4, :o2, 1933173000
-          tz.transition 2031, 10, :o3, 1948897800
-          tz.transition 2032, 4, :o2, 1964622600
-          tz.transition 2032, 10, :o3, 1980347400
-          tz.transition 2033, 4, :o2, 1996072200
-          tz.transition 2033, 10, :o3, 2011797000
-          tz.transition 2034, 4, :o2, 2027521800
-          tz.transition 2034, 9, :o3, 2043246600
-          tz.transition 2035, 3, :o2, 2058971400
-          tz.transition 2035, 10, :o3, 2075301000
-          tz.transition 2036, 4, :o2, 2091025800
-          tz.transition 2036, 10, :o3, 2106750600
-          tz.transition 2037, 4, :o2, 2122475400
-          tz.transition 2037, 10, :o3, 2138200200
-          tz.transition 2038, 4, :o2, 39448275, 16
-          tz.transition 2038, 10, :o3, 39451187, 16
-          tz.transition 2039, 4, :o2, 39454099, 16
-          tz.transition 2039, 10, :o3, 39457011, 16
-          tz.transition 2040, 3, :o2, 39459923, 16
-          tz.transition 2040, 10, :o3, 39462947, 16
-          tz.transition 2041, 4, :o2, 39465859, 16
-          tz.transition 2041, 10, :o3, 39468771, 16
-          tz.transition 2042, 4, :o2, 39471683, 16
-          tz.transition 2042, 10, :o3, 39474595, 16
-          tz.transition 2043, 4, :o2, 39477507, 16
-          tz.transition 2043, 10, :o3, 39480419, 16
-          tz.transition 2044, 4, :o2, 39483331, 16
-          tz.transition 2044, 10, :o3, 39486243, 16
-          tz.transition 2045, 4, :o2, 39489155, 16
-          tz.transition 2045, 9, :o3, 39492067, 16
-          tz.transition 2046, 3, :o2, 39494979, 16
-          tz.transition 2046, 10, :o3, 39498003, 16
-          tz.transition 2047, 4, :o2, 39500915, 16
-          tz.transition 2047, 10, :o3, 39503827, 16
-          tz.transition 2048, 4, :o2, 39506739, 16
-          tz.transition 2048, 10, :o3, 39509651, 16
-          tz.transition 2049, 4, :o2, 39512563, 16
-          tz.transition 2049, 10, :o3, 39515475, 16
-          tz.transition 2050, 4, :o2, 39518387, 16
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Brisbane.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Brisbane.rb
deleted file mode 100644
index dd85ddae94..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Brisbane.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Brisbane
-        include TimezoneDefinition
-        
-        timezone 'Australia/Brisbane' do |tz|
-          tz.offset :o0, 36728, 0, :LMT
-          tz.offset :o1, 36000, 0, :EST
-          tz.offset :o2, 36000, 3600, :EST
-          
-          tz.transition 1894, 12, :o1, 26062496009, 10800
-          tz.transition 1916, 12, :o2, 3486569881, 1440
-          tz.transition 1917, 3, :o1, 19370497, 8
-          tz.transition 1941, 12, :o2, 14582161, 6
-          tz.transition 1942, 3, :o1, 19443577, 8
-          tz.transition 1942, 9, :o2, 14583775, 6
-          tz.transition 1943, 3, :o1, 19446489, 8
-          tz.transition 1943, 10, :o2, 14586001, 6
-          tz.transition 1944, 3, :o1, 19449401, 8
-          tz.transition 1971, 10, :o2, 57686400
-          tz.transition 1972, 2, :o1, 67968000
-          tz.transition 1989, 10, :o2, 625593600
-          tz.transition 1990, 3, :o1, 636480000
-          tz.transition 1990, 10, :o2, 657043200
-          tz.transition 1991, 3, :o1, 667929600
-          tz.transition 1991, 10, :o2, 688492800
-          tz.transition 1992, 2, :o1, 699379200
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Darwin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Darwin.rb
deleted file mode 100644
index 17de88124d..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Darwin.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Darwin
-        include TimezoneDefinition
-        
-        timezone 'Australia/Darwin' do |tz|
-          tz.offset :o0, 31400, 0, :LMT
-          tz.offset :o1, 32400, 0, :CST
-          tz.offset :o2, 34200, 0, :CST
-          tz.offset :o3, 34200, 3600, :CST
-          
-          tz.transition 1895, 1, :o1, 1042513259, 432
-          tz.transition 1899, 4, :o2, 19318201, 8
-          tz.transition 1916, 12, :o3, 3486569911, 1440
-          tz.transition 1917, 3, :o2, 116222983, 48
-          tz.transition 1941, 12, :o3, 38885763, 16
-          tz.transition 1942, 3, :o2, 116661463, 48
-          tz.transition 1942, 9, :o3, 38890067, 16
-          tz.transition 1943, 3, :o2, 116678935, 48
-          tz.transition 1943, 10, :o3, 38896003, 16
-          tz.transition 1944, 3, :o2, 116696407, 48
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Hobart.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Hobart.rb
deleted file mode 100644
index 11384b9840..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Hobart.rb
+++ /dev/null
@@ -1,193 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Hobart
-        include TimezoneDefinition
-        
-        timezone 'Australia/Hobart' do |tz|
-          tz.offset :o0, 35356, 0, :LMT
-          tz.offset :o1, 36000, 0, :EST
-          tz.offset :o2, 36000, 3600, :EST
-          
-          tz.transition 1895, 8, :o1, 52130241161, 21600
-          tz.transition 1916, 9, :o2, 14526823, 6
-          tz.transition 1917, 3, :o1, 19370497, 8
-          tz.transition 1941, 12, :o2, 14582161, 6
-          tz.transition 1942, 3, :o1, 19443577, 8
-          tz.transition 1942, 9, :o2, 14583775, 6
-          tz.transition 1943, 3, :o1, 19446489, 8
-          tz.transition 1943, 10, :o2, 14586001, 6
-          tz.transition 1944, 3, :o1, 19449401, 8
-          tz.transition 1967, 9, :o2, 14638585, 6
-          tz.transition 1968, 3, :o1, 14639677, 6
-          tz.transition 1968, 10, :o2, 14640937, 6
-          tz.transition 1969, 3, :o1, 14641735, 6
-          tz.transition 1969, 10, :o2, 14643121, 6
-          tz.transition 1970, 3, :o1, 5673600
-          tz.transition 1970, 10, :o2, 25632000
-          tz.transition 1971, 3, :o1, 37728000
-          tz.transition 1971, 10, :o2, 57686400
-          tz.transition 1972, 2, :o1, 67968000
-          tz.transition 1972, 10, :o2, 89136000
-          tz.transition 1973, 3, :o1, 100022400
-          tz.transition 1973, 10, :o2, 120585600
-          tz.transition 1974, 3, :o1, 131472000
-          tz.transition 1974, 10, :o2, 152035200
-          tz.transition 1975, 3, :o1, 162921600
-          tz.transition 1975, 10, :o2, 183484800
-          tz.transition 1976, 3, :o1, 194976000
-          tz.transition 1976, 10, :o2, 215539200
-          tz.transition 1977, 3, :o1, 226425600
-          tz.transition 1977, 10, :o2, 246988800
-          tz.transition 1978, 3, :o1, 257875200
-          tz.transition 1978, 10, :o2, 278438400
-          tz.transition 1979, 3, :o1, 289324800
-          tz.transition 1979, 10, :o2, 309888000
-          tz.transition 1980, 3, :o1, 320774400
-          tz.transition 1980, 10, :o2, 341337600
-          tz.transition 1981, 2, :o1, 352224000
-          tz.transition 1981, 10, :o2, 372787200
-          tz.transition 1982, 3, :o1, 386092800
-          tz.transition 1982, 10, :o2, 404841600
-          tz.transition 1983, 3, :o1, 417542400
-          tz.transition 1983, 10, :o2, 436291200
-          tz.transition 1984, 3, :o1, 447177600
-          tz.transition 1984, 10, :o2, 467740800
-          tz.transition 1985, 3, :o1, 478627200
-          tz.transition 1985, 10, :o2, 499190400
-          tz.transition 1986, 3, :o1, 510076800
-          tz.transition 1986, 10, :o2, 530035200
-          tz.transition 1987, 3, :o1, 542736000
-          tz.transition 1987, 10, :o2, 562089600
-          tz.transition 1988, 3, :o1, 574790400
-          tz.transition 1988, 10, :o2, 594144000
-          tz.transition 1989, 3, :o1, 606240000
-          tz.transition 1989, 10, :o2, 625593600
-          tz.transition 1990, 3, :o1, 637689600
-          tz.transition 1990, 10, :o2, 657043200
-          tz.transition 1991, 3, :o1, 670348800
-          tz.transition 1991, 10, :o2, 686678400
-          tz.transition 1992, 3, :o1, 701798400
-          tz.transition 1992, 10, :o2, 718128000
-          tz.transition 1993, 3, :o1, 733248000
-          tz.transition 1993, 10, :o2, 749577600
-          tz.transition 1994, 3, :o1, 764697600
-          tz.transition 1994, 10, :o2, 781027200
-          tz.transition 1995, 3, :o1, 796147200
-          tz.transition 1995, 9, :o2, 812476800
-          tz.transition 1996, 3, :o1, 828201600
-          tz.transition 1996, 10, :o2, 844531200
-          tz.transition 1997, 3, :o1, 859651200
-          tz.transition 1997, 10, :o2, 875980800
-          tz.transition 1998, 3, :o1, 891100800
-          tz.transition 1998, 10, :o2, 907430400
-          tz.transition 1999, 3, :o1, 922550400
-          tz.transition 1999, 10, :o2, 938880000
-          tz.transition 2000, 3, :o1, 954000000
-          tz.transition 2000, 8, :o2, 967305600
-          tz.transition 2001, 3, :o1, 985449600
-          tz.transition 2001, 10, :o2, 1002384000
-          tz.transition 2002, 3, :o1, 1017504000
-          tz.transition 2002, 10, :o2, 1033833600
-          tz.transition 2003, 3, :o1, 1048953600
-          tz.transition 2003, 10, :o2, 1065283200
-          tz.transition 2004, 3, :o1, 1080403200
-          tz.transition 2004, 10, :o2, 1096732800
-          tz.transition 2005, 3, :o1, 1111852800
-          tz.transition 2005, 10, :o2, 1128182400
-          tz.transition 2006, 4, :o1, 1143907200
-          tz.transition 2006, 9, :o2, 1159632000
-          tz.transition 2007, 3, :o1, 1174752000
-          tz.transition 2007, 10, :o2, 1191686400
-          tz.transition 2008, 4, :o1, 1207411200
-          tz.transition 2008, 10, :o2, 1223136000
-          tz.transition 2009, 4, :o1, 1238860800
-          tz.transition 2009, 10, :o2, 1254585600
-          tz.transition 2010, 4, :o1, 1270310400
-          tz.transition 2010, 10, :o2, 1286035200
-          tz.transition 2011, 4, :o1, 1301760000
-          tz.transition 2011, 10, :o2, 1317484800
-          tz.transition 2012, 3, :o1, 1333209600
-          tz.transition 2012, 10, :o2, 1349539200
-          tz.transition 2013, 4, :o1, 1365264000
-          tz.transition 2013, 10, :o2, 1380988800
-          tz.transition 2014, 4, :o1, 1396713600
-          tz.transition 2014, 10, :o2, 1412438400
-          tz.transition 2015, 4, :o1, 1428163200
-          tz.transition 2015, 10, :o2, 1443888000
-          tz.transition 2016, 4, :o1, 1459612800
-          tz.transition 2016, 10, :o2, 1475337600
-          tz.transition 2017, 4, :o1, 1491062400
-          tz.transition 2017, 9, :o2, 1506787200
-          tz.transition 2018, 3, :o1, 1522512000
-          tz.transition 2018, 10, :o2, 1538841600
-          tz.transition 2019, 4, :o1, 1554566400
-          tz.transition 2019, 10, :o2, 1570291200
-          tz.transition 2020, 4, :o1, 1586016000
-          tz.transition 2020, 10, :o2, 1601740800
-          tz.transition 2021, 4, :o1, 1617465600
-          tz.transition 2021, 10, :o2, 1633190400
-          tz.transition 2022, 4, :o1, 1648915200
-          tz.transition 2022, 10, :o2, 1664640000
-          tz.transition 2023, 4, :o1, 1680364800
-          tz.transition 2023, 9, :o2, 1696089600
-          tz.transition 2024, 4, :o1, 1712419200
-          tz.transition 2024, 10, :o2, 1728144000
-          tz.transition 2025, 4, :o1, 1743868800
-          tz.transition 2025, 10, :o2, 1759593600
-          tz.transition 2026, 4, :o1, 1775318400
-          tz.transition 2026, 10, :o2, 1791043200
-          tz.transition 2027, 4, :o1, 1806768000
-          tz.transition 2027, 10, :o2, 1822492800
-          tz.transition 2028, 4, :o1, 1838217600
-          tz.transition 2028, 9, :o2, 1853942400
-          tz.transition 2029, 3, :o1, 1869667200
-          tz.transition 2029, 10, :o2, 1885996800
-          tz.transition 2030, 4, :o1, 1901721600
-          tz.transition 2030, 10, :o2, 1917446400
-          tz.transition 2031, 4, :o1, 1933171200
-          tz.transition 2031, 10, :o2, 1948896000
-          tz.transition 2032, 4, :o1, 1964620800
-          tz.transition 2032, 10, :o2, 1980345600
-          tz.transition 2033, 4, :o1, 1996070400
-          tz.transition 2033, 10, :o2, 2011795200
-          tz.transition 2034, 4, :o1, 2027520000
-          tz.transition 2034, 9, :o2, 2043244800
-          tz.transition 2035, 3, :o1, 2058969600
-          tz.transition 2035, 10, :o2, 2075299200
-          tz.transition 2036, 4, :o1, 2091024000
-          tz.transition 2036, 10, :o2, 2106748800
-          tz.transition 2037, 4, :o1, 2122473600
-          tz.transition 2037, 10, :o2, 2138198400
-          tz.transition 2038, 4, :o1, 14793103, 6
-          tz.transition 2038, 10, :o2, 14794195, 6
-          tz.transition 2039, 4, :o1, 14795287, 6
-          tz.transition 2039, 10, :o2, 14796379, 6
-          tz.transition 2040, 3, :o1, 14797471, 6
-          tz.transition 2040, 10, :o2, 14798605, 6
-          tz.transition 2041, 4, :o1, 14799697, 6
-          tz.transition 2041, 10, :o2, 14800789, 6
-          tz.transition 2042, 4, :o1, 14801881, 6
-          tz.transition 2042, 10, :o2, 14802973, 6
-          tz.transition 2043, 4, :o1, 14804065, 6
-          tz.transition 2043, 10, :o2, 14805157, 6
-          tz.transition 2044, 4, :o1, 14806249, 6
-          tz.transition 2044, 10, :o2, 14807341, 6
-          tz.transition 2045, 4, :o1, 14808433, 6
-          tz.transition 2045, 9, :o2, 14809525, 6
-          tz.transition 2046, 3, :o1, 14810617, 6
-          tz.transition 2046, 10, :o2, 14811751, 6
-          tz.transition 2047, 4, :o1, 14812843, 6
-          tz.transition 2047, 10, :o2, 14813935, 6
-          tz.transition 2048, 4, :o1, 14815027, 6
-          tz.transition 2048, 10, :o2, 14816119, 6
-          tz.transition 2049, 4, :o1, 14817211, 6
-          tz.transition 2049, 10, :o2, 14818303, 6
-          tz.transition 2050, 4, :o1, 14819395, 6
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Melbourne.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Melbourne.rb
deleted file mode 100644
index c1304488ea..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Melbourne.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Melbourne
-        include TimezoneDefinition
-        
-        timezone 'Australia/Melbourne' do |tz|
-          tz.offset :o0, 34792, 0, :LMT
-          tz.offset :o1, 36000, 0, :EST
-          tz.offset :o2, 36000, 3600, :EST
-          
-          tz.transition 1895, 1, :o1, 26062831051, 10800
-          tz.transition 1916, 12, :o2, 3486569881, 1440
-          tz.transition 1917, 3, :o1, 19370497, 8
-          tz.transition 1941, 12, :o2, 14582161, 6
-          tz.transition 1942, 3, :o1, 19443577, 8
-          tz.transition 1942, 9, :o2, 14583775, 6
-          tz.transition 1943, 3, :o1, 19446489, 8
-          tz.transition 1943, 10, :o2, 14586001, 6
-          tz.transition 1944, 3, :o1, 19449401, 8
-          tz.transition 1971, 10, :o2, 57686400
-          tz.transition 1972, 2, :o1, 67968000
-          tz.transition 1972, 10, :o2, 89136000
-          tz.transition 1973, 3, :o1, 100022400
-          tz.transition 1973, 10, :o2, 120585600
-          tz.transition 1974, 3, :o1, 131472000
-          tz.transition 1974, 10, :o2, 152035200
-          tz.transition 1975, 3, :o1, 162921600
-          tz.transition 1975, 10, :o2, 183484800
-          tz.transition 1976, 3, :o1, 194976000
-          tz.transition 1976, 10, :o2, 215539200
-          tz.transition 1977, 3, :o1, 226425600
-          tz.transition 1977, 10, :o2, 246988800
-          tz.transition 1978, 3, :o1, 257875200
-          tz.transition 1978, 10, :o2, 278438400
-          tz.transition 1979, 3, :o1, 289324800
-          tz.transition 1979, 10, :o2, 309888000
-          tz.transition 1980, 3, :o1, 320774400
-          tz.transition 1980, 10, :o2, 341337600
-          tz.transition 1981, 2, :o1, 352224000
-          tz.transition 1981, 10, :o2, 372787200
-          tz.transition 1982, 3, :o1, 384278400
-          tz.transition 1982, 10, :o2, 404841600
-          tz.transition 1983, 3, :o1, 415728000
-          tz.transition 1983, 10, :o2, 436291200
-          tz.transition 1984, 3, :o1, 447177600
-          tz.transition 1984, 10, :o2, 467740800
-          tz.transition 1985, 3, :o1, 478627200
-          tz.transition 1985, 10, :o2, 499190400
-          tz.transition 1986, 3, :o1, 511286400
-          tz.transition 1986, 10, :o2, 530035200
-          tz.transition 1987, 3, :o1, 542736000
-          tz.transition 1987, 10, :o2, 561484800
-          tz.transition 1988, 3, :o1, 574790400
-          tz.transition 1988, 10, :o2, 594144000
-          tz.transition 1989, 3, :o1, 606240000
-          tz.transition 1989, 10, :o2, 625593600
-          tz.transition 1990, 3, :o1, 637689600
-          tz.transition 1990, 10, :o2, 657043200
-          tz.transition 1991, 3, :o1, 667929600
-          tz.transition 1991, 10, :o2, 688492800
-          tz.transition 1992, 2, :o1, 699379200
-          tz.transition 1992, 10, :o2, 719942400
-          tz.transition 1993, 3, :o1, 731433600
-          tz.transition 1993, 10, :o2, 751996800
-          tz.transition 1994, 3, :o1, 762883200
-          tz.transition 1994, 10, :o2, 783446400
-          tz.transition 1995, 3, :o1, 796147200
-          tz.transition 1995, 10, :o2, 814896000
-          tz.transition 1996, 3, :o1, 828201600
-          tz.transition 1996, 10, :o2, 846345600
-          tz.transition 1997, 3, :o1, 859651200
-          tz.transition 1997, 10, :o2, 877795200
-          tz.transition 1998, 3, :o1, 891100800
-          tz.transition 1998, 10, :o2, 909244800
-          tz.transition 1999, 3, :o1, 922550400
-          tz.transition 1999, 10, :o2, 941299200
-          tz.transition 2000, 3, :o1, 954000000
-          tz.transition 2000, 8, :o2, 967305600
-          tz.transition 2001, 3, :o1, 985449600
-          tz.transition 2001, 10, :o2, 1004198400
-          tz.transition 2002, 3, :o1, 1017504000
-          tz.transition 2002, 10, :o2, 1035648000
-          tz.transition 2003, 3, :o1, 1048953600
-          tz.transition 2003, 10, :o2, 1067097600
-          tz.transition 2004, 3, :o1, 1080403200
-          tz.transition 2004, 10, :o2, 1099152000
-          tz.transition 2005, 3, :o1, 1111852800
-          tz.transition 2005, 10, :o2, 1130601600
-          tz.transition 2006, 4, :o1, 1143907200
-          tz.transition 2006, 10, :o2, 1162051200
-          tz.transition 2007, 3, :o1, 1174752000
-          tz.transition 2007, 10, :o2, 1193500800
-          tz.transition 2008, 4, :o1, 1207411200
-          tz.transition 2008, 10, :o2, 1223136000
-          tz.transition 2009, 4, :o1, 1238860800
-          tz.transition 2009, 10, :o2, 1254585600
-          tz.transition 2010, 4, :o1, 1270310400
-          tz.transition 2010, 10, :o2, 1286035200
-          tz.transition 2011, 4, :o1, 1301760000
-          tz.transition 2011, 10, :o2, 1317484800
-          tz.transition 2012, 3, :o1, 1333209600
-          tz.transition 2012, 10, :o2, 1349539200
-          tz.transition 2013, 4, :o1, 1365264000
-          tz.transition 2013, 10, :o2, 1380988800
-          tz.transition 2014, 4, :o1, 1396713600
-          tz.transition 2014, 10, :o2, 1412438400
-          tz.transition 2015, 4, :o1, 1428163200
-          tz.transition 2015, 10, :o2, 1443888000
-          tz.transition 2016, 4, :o1, 1459612800
-          tz.transition 2016, 10, :o2, 1475337600
-          tz.transition 2017, 4, :o1, 1491062400
-          tz.transition 2017, 9, :o2, 1506787200
-          tz.transition 2018, 3, :o1, 1522512000
-          tz.transition 2018, 10, :o2, 1538841600
-          tz.transition 2019, 4, :o1, 1554566400
-          tz.transition 2019, 10, :o2, 1570291200
-          tz.transition 2020, 4, :o1, 1586016000
-          tz.transition 2020, 10, :o2, 1601740800
-          tz.transition 2021, 4, :o1, 1617465600
-          tz.transition 2021, 10, :o2, 1633190400
-          tz.transition 2022, 4, :o1, 1648915200
-          tz.transition 2022, 10, :o2, 1664640000
-          tz.transition 2023, 4, :o1, 1680364800
-          tz.transition 2023, 9, :o2, 1696089600
-          tz.transition 2024, 4, :o1, 1712419200
-          tz.transition 2024, 10, :o2, 1728144000
-          tz.transition 2025, 4, :o1, 1743868800
-          tz.transition 2025, 10, :o2, 1759593600
-          tz.transition 2026, 4, :o1, 1775318400
-          tz.transition 2026, 10, :o2, 1791043200
-          tz.transition 2027, 4, :o1, 1806768000
-          tz.transition 2027, 10, :o2, 1822492800
-          tz.transition 2028, 4, :o1, 1838217600
-          tz.transition 2028, 9, :o2, 1853942400
-          tz.transition 2029, 3, :o1, 1869667200
-          tz.transition 2029, 10, :o2, 1885996800
-          tz.transition 2030, 4, :o1, 1901721600
-          tz.transition 2030, 10, :o2, 1917446400
-          tz.transition 2031, 4, :o1, 1933171200
-          tz.transition 2031, 10, :o2, 1948896000
-          tz.transition 2032, 4, :o1, 1964620800
-          tz.transition 2032, 10, :o2, 1980345600
-          tz.transition 2033, 4, :o1, 1996070400
-          tz.transition 2033, 10, :o2, 2011795200
-          tz.transition 2034, 4, :o1, 2027520000
-          tz.transition 2034, 9, :o2, 2043244800
-          tz.transition 2035, 3, :o1, 2058969600
-          tz.transition 2035, 10, :o2, 2075299200
-          tz.transition 2036, 4, :o1, 2091024000
-          tz.transition 2036, 10, :o2, 2106748800
-          tz.transition 2037, 4, :o1, 2122473600
-          tz.transition 2037, 10, :o2, 2138198400
-          tz.transition 2038, 4, :o1, 14793103, 6
-          tz.transition 2038, 10, :o2, 14794195, 6
-          tz.transition 2039, 4, :o1, 14795287, 6
-          tz.transition 2039, 10, :o2, 14796379, 6
-          tz.transition 2040, 3, :o1, 14797471, 6
-          tz.transition 2040, 10, :o2, 14798605, 6
-          tz.transition 2041, 4, :o1, 14799697, 6
-          tz.transition 2041, 10, :o2, 14800789, 6
-          tz.transition 2042, 4, :o1, 14801881, 6
-          tz.transition 2042, 10, :o2, 14802973, 6
-          tz.transition 2043, 4, :o1, 14804065, 6
-          tz.transition 2043, 10, :o2, 14805157, 6
-          tz.transition 2044, 4, :o1, 14806249, 6
-          tz.transition 2044, 10, :o2, 14807341, 6
-          tz.transition 2045, 4, :o1, 14808433, 6
-          tz.transition 2045, 9, :o2, 14809525, 6
-          tz.transition 2046, 3, :o1, 14810617, 6
-          tz.transition 2046, 10, :o2, 14811751, 6
-          tz.transition 2047, 4, :o1, 14812843, 6
-          tz.transition 2047, 10, :o2, 14813935, 6
-          tz.transition 2048, 4, :o1, 14815027, 6
-          tz.transition 2048, 10, :o2, 14816119, 6
-          tz.transition 2049, 4, :o1, 14817211, 6
-          tz.transition 2049, 10, :o2, 14818303, 6
-          tz.transition 2050, 4, :o1, 14819395, 6
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Perth.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Perth.rb
deleted file mode 100644
index d9e66f14a8..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Perth.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Perth
-        include TimezoneDefinition
-        
-        timezone 'Australia/Perth' do |tz|
-          tz.offset :o0, 27804, 0, :LMT
-          tz.offset :o1, 28800, 0, :WST
-          tz.offset :o2, 28800, 3600, :WST
-          
-          tz.transition 1895, 11, :o1, 17377402883, 7200
-          tz.transition 1916, 12, :o2, 3486570001, 1440
-          tz.transition 1917, 3, :o1, 58111493, 24
-          tz.transition 1941, 12, :o2, 9721441, 4
-          tz.transition 1942, 3, :o1, 58330733, 24
-          tz.transition 1942, 9, :o2, 9722517, 4
-          tz.transition 1943, 3, :o1, 58339469, 24
-          tz.transition 1974, 10, :o2, 152042400
-          tz.transition 1975, 3, :o1, 162928800
-          tz.transition 1983, 10, :o2, 436298400
-          tz.transition 1984, 3, :o1, 447184800
-          tz.transition 1991, 11, :o2, 690314400
-          tz.transition 1992, 2, :o1, 699386400
-          tz.transition 2006, 12, :o2, 1165082400
-          tz.transition 2007, 3, :o1, 1174759200
-          tz.transition 2007, 10, :o2, 1193508000
-          tz.transition 2008, 3, :o1, 1206813600
-          tz.transition 2008, 10, :o2, 1224957600
-          tz.transition 2009, 3, :o1, 1238263200
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Sydney.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Sydney.rb
deleted file mode 100644
index 9062bd7c3c..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Sydney.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Australia
-      module Sydney
-        include TimezoneDefinition
-        
-        timezone 'Australia/Sydney' do |tz|
-          tz.offset :o0, 36292, 0, :LMT
-          tz.offset :o1, 36000, 0, :EST
-          tz.offset :o2, 36000, 3600, :EST
-          
-          tz.transition 1895, 1, :o1, 52125661727, 21600
-          tz.transition 1916, 12, :o2, 3486569881, 1440
-          tz.transition 1917, 3, :o1, 19370497, 8
-          tz.transition 1941, 12, :o2, 14582161, 6
-          tz.transition 1942, 3, :o1, 19443577, 8
-          tz.transition 1942, 9, :o2, 14583775, 6
-          tz.transition 1943, 3, :o1, 19446489, 8
-          tz.transition 1943, 10, :o2, 14586001, 6
-          tz.transition 1944, 3, :o1, 19449401, 8
-          tz.transition 1971, 10, :o2, 57686400
-          tz.transition 1972, 2, :o1, 67968000
-          tz.transition 1972, 10, :o2, 89136000
-          tz.transition 1973, 3, :o1, 100022400
-          tz.transition 1973, 10, :o2, 120585600
-          tz.transition 1974, 3, :o1, 131472000
-          tz.transition 1974, 10, :o2, 152035200
-          tz.transition 1975, 3, :o1, 162921600
-          tz.transition 1975, 10, :o2, 183484800
-          tz.transition 1976, 3, :o1, 194976000
-          tz.transition 1976, 10, :o2, 215539200
-          tz.transition 1977, 3, :o1, 226425600
-          tz.transition 1977, 10, :o2, 246988800
-          tz.transition 1978, 3, :o1, 257875200
-          tz.transition 1978, 10, :o2, 278438400
-          tz.transition 1979, 3, :o1, 289324800
-          tz.transition 1979, 10, :o2, 309888000
-          tz.transition 1980, 3, :o1, 320774400
-          tz.transition 1980, 10, :o2, 341337600
-          tz.transition 1981, 2, :o1, 352224000
-          tz.transition 1981, 10, :o2, 372787200
-          tz.transition 1982, 4, :o1, 386697600
-          tz.transition 1982, 10, :o2, 404841600
-          tz.transition 1983, 3, :o1, 415728000
-          tz.transition 1983, 10, :o2, 436291200
-          tz.transition 1984, 3, :o1, 447177600
-          tz.transition 1984, 10, :o2, 467740800
-          tz.transition 1985, 3, :o1, 478627200
-          tz.transition 1985, 10, :o2, 499190400
-          tz.transition 1986, 3, :o1, 511286400
-          tz.transition 1986, 10, :o2, 530035200
-          tz.transition 1987, 3, :o1, 542736000
-          tz.transition 1987, 10, :o2, 562089600
-          tz.transition 1988, 3, :o1, 574790400
-          tz.transition 1988, 10, :o2, 594144000
-          tz.transition 1989, 3, :o1, 606240000
-          tz.transition 1989, 10, :o2, 625593600
-          tz.transition 1990, 3, :o1, 636480000
-          tz.transition 1990, 10, :o2, 657043200
-          tz.transition 1991, 3, :o1, 667929600
-          tz.transition 1991, 10, :o2, 688492800
-          tz.transition 1992, 2, :o1, 699379200
-          tz.transition 1992, 10, :o2, 719942400
-          tz.transition 1993, 3, :o1, 731433600
-          tz.transition 1993, 10, :o2, 751996800
-          tz.transition 1994, 3, :o1, 762883200
-          tz.transition 1994, 10, :o2, 783446400
-          tz.transition 1995, 3, :o1, 794332800
-          tz.transition 1995, 10, :o2, 814896000
-          tz.transition 1996, 3, :o1, 828201600
-          tz.transition 1996, 10, :o2, 846345600
-          tz.transition 1997, 3, :o1, 859651200
-          tz.transition 1997, 10, :o2, 877795200
-          tz.transition 1998, 3, :o1, 891100800
-          tz.transition 1998, 10, :o2, 909244800
-          tz.transition 1999, 3, :o1, 922550400
-          tz.transition 1999, 10, :o2, 941299200
-          tz.transition 2000, 3, :o1, 954000000
-          tz.transition 2000, 8, :o2, 967305600
-          tz.transition 2001, 3, :o1, 985449600
-          tz.transition 2001, 10, :o2, 1004198400
-          tz.transition 2002, 3, :o1, 1017504000
-          tz.transition 2002, 10, :o2, 1035648000
-          tz.transition 2003, 3, :o1, 1048953600
-          tz.transition 2003, 10, :o2, 1067097600
-          tz.transition 2004, 3, :o1, 1080403200
-          tz.transition 2004, 10, :o2, 1099152000
-          tz.transition 2005, 3, :o1, 1111852800
-          tz.transition 2005, 10, :o2, 1130601600
-          tz.transition 2006, 4, :o1, 1143907200
-          tz.transition 2006, 10, :o2, 1162051200
-          tz.transition 2007, 3, :o1, 1174752000
-          tz.transition 2007, 10, :o2, 1193500800
-          tz.transition 2008, 4, :o1, 1207411200
-          tz.transition 2008, 10, :o2, 1223136000
-          tz.transition 2009, 4, :o1, 1238860800
-          tz.transition 2009, 10, :o2, 1254585600
-          tz.transition 2010, 4, :o1, 1270310400
-          tz.transition 2010, 10, :o2, 1286035200
-          tz.transition 2011, 4, :o1, 1301760000
-          tz.transition 2011, 10, :o2, 1317484800
-          tz.transition 2012, 3, :o1, 1333209600
-          tz.transition 2012, 10, :o2, 1349539200
-          tz.transition 2013, 4, :o1, 1365264000
-          tz.transition 2013, 10, :o2, 1380988800
-          tz.transition 2014, 4, :o1, 1396713600
-          tz.transition 2014, 10, :o2, 1412438400
-          tz.transition 2015, 4, :o1, 1428163200
-          tz.transition 2015, 10, :o2, 1443888000
-          tz.transition 2016, 4, :o1, 1459612800
-          tz.transition 2016, 10, :o2, 1475337600
-          tz.transition 2017, 4, :o1, 1491062400
-          tz.transition 2017, 9, :o2, 1506787200
-          tz.transition 2018, 3, :o1, 1522512000
-          tz.transition 2018, 10, :o2, 1538841600
-          tz.transition 2019, 4, :o1, 1554566400
-          tz.transition 2019, 10, :o2, 1570291200
-          tz.transition 2020, 4, :o1, 1586016000
-          tz.transition 2020, 10, :o2, 1601740800
-          tz.transition 2021, 4, :o1, 1617465600
-          tz.transition 2021, 10, :o2, 1633190400
-          tz.transition 2022, 4, :o1, 1648915200
-          tz.transition 2022, 10, :o2, 1664640000
-          tz.transition 2023, 4, :o1, 1680364800
-          tz.transition 2023, 9, :o2, 1696089600
-          tz.transition 2024, 4, :o1, 1712419200
-          tz.transition 2024, 10, :o2, 1728144000
-          tz.transition 2025, 4, :o1, 1743868800
-          tz.transition 2025, 10, :o2, 1759593600
-          tz.transition 2026, 4, :o1, 1775318400
-          tz.transition 2026, 10, :o2, 1791043200
-          tz.transition 2027, 4, :o1, 1806768000
-          tz.transition 2027, 10, :o2, 1822492800
-          tz.transition 2028, 4, :o1, 1838217600
-          tz.transition 2028, 9, :o2, 1853942400
-          tz.transition 2029, 3, :o1, 1869667200
-          tz.transition 2029, 10, :o2, 1885996800
-          tz.transition 2030, 4, :o1, 1901721600
-          tz.transition 2030, 10, :o2, 1917446400
-          tz.transition 2031, 4, :o1, 1933171200
-          tz.transition 2031, 10, :o2, 1948896000
-          tz.transition 2032, 4, :o1, 1964620800
-          tz.transition 2032, 10, :o2, 1980345600
-          tz.transition 2033, 4, :o1, 1996070400
-          tz.transition 2033, 10, :o2, 2011795200
-          tz.transition 2034, 4, :o1, 2027520000
-          tz.transition 2034, 9, :o2, 2043244800
-          tz.transition 2035, 3, :o1, 2058969600
-          tz.transition 2035, 10, :o2, 2075299200
-          tz.transition 2036, 4, :o1, 2091024000
-          tz.transition 2036, 10, :o2, 2106748800
-          tz.transition 2037, 4, :o1, 2122473600
-          tz.transition 2037, 10, :o2, 2138198400
-          tz.transition 2038, 4, :o1, 14793103, 6
-          tz.transition 2038, 10, :o2, 14794195, 6
-          tz.transition 2039, 4, :o1, 14795287, 6
-          tz.transition 2039, 10, :o2, 14796379, 6
-          tz.transition 2040, 3, :o1, 14797471, 6
-          tz.transition 2040, 10, :o2, 14798605, 6
-          tz.transition 2041, 4, :o1, 14799697, 6
-          tz.transition 2041, 10, :o2, 14800789, 6
-          tz.transition 2042, 4, :o1, 14801881, 6
-          tz.transition 2042, 10, :o2, 14802973, 6
-          tz.transition 2043, 4, :o1, 14804065, 6
-          tz.transition 2043, 10, :o2, 14805157, 6
-          tz.transition 2044, 4, :o1, 14806249, 6
-          tz.transition 2044, 10, :o2, 14807341, 6
-          tz.transition 2045, 4, :o1, 14808433, 6
-          tz.transition 2045, 9, :o2, 14809525, 6
-          tz.transition 2046, 3, :o1, 14810617, 6
-          tz.transition 2046, 10, :o2, 14811751, 6
-          tz.transition 2047, 4, :o1, 14812843, 6
-          tz.transition 2047, 10, :o2, 14813935, 6
-          tz.transition 2048, 4, :o1, 14815027, 6
-          tz.transition 2048, 10, :o2, 14816119, 6
-          tz.transition 2049, 4, :o1, 14817211, 6
-          tz.transition 2049, 10, :o2, 14818303, 6
-          tz.transition 2050, 4, :o1, 14819395, 6
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Etc/UTC.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Etc/UTC.rb
deleted file mode 100644
index 28b2c6a04c..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Etc/UTC.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Etc
-      module UTC
-        include TimezoneDefinition
-        
-        timezone 'Etc/UTC' do |tz|
-          tz.offset :o0, 0, 0, :UTC
-          
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Amsterdam.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Amsterdam.rb
deleted file mode 100644
index 2d0c95c4bc..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Amsterdam.rb
+++ /dev/null
@@ -1,228 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Amsterdam
-        include TimezoneDefinition
-        
-        timezone 'Europe/Amsterdam' do |tz|
-          tz.offset :o0, 1172, 0, :LMT
-          tz.offset :o1, 1172, 0, :AMT
-          tz.offset :o2, 1172, 3600, :NST
-          tz.offset :o3, 1200, 3600, :NEST
-          tz.offset :o4, 1200, 0, :NET
-          tz.offset :o5, 3600, 3600, :CEST
-          tz.offset :o6, 3600, 0, :CET
-          
-          tz.transition 1834, 12, :o1, 51651636907, 21600
-          tz.transition 1916, 4, :o2, 52293264907, 21600
-          tz.transition 1916, 9, :o1, 52296568807, 21600
-          tz.transition 1917, 4, :o2, 52300826707, 21600
-          tz.transition 1917, 9, :o1, 52304153107, 21600
-          tz.transition 1918, 4, :o2, 52308386707, 21600
-          tz.transition 1918, 9, :o1, 52312317907, 21600
-          tz.transition 1919, 4, :o2, 52316400307, 21600
-          tz.transition 1919, 9, :o1, 52320180307, 21600
-          tz.transition 1920, 4, :o2, 52324262707, 21600
-          tz.transition 1920, 9, :o1, 52328042707, 21600
-          tz.transition 1921, 4, :o2, 52332125107, 21600
-          tz.transition 1921, 9, :o1, 52335905107, 21600
-          tz.transition 1922, 3, :o2, 52339814707, 21600
-          tz.transition 1922, 10, :o1, 52344048307, 21600
-          tz.transition 1923, 6, :o2, 52349145907, 21600
-          tz.transition 1923, 10, :o1, 52351910707, 21600
-          tz.transition 1924, 3, :o2, 52355690707, 21600
-          tz.transition 1924, 10, :o1, 52359773107, 21600
-          tz.transition 1925, 6, :o2, 52365021907, 21600
-          tz.transition 1925, 10, :o1, 52367635507, 21600
-          tz.transition 1926, 5, :o2, 52372452307, 21600
-          tz.transition 1926, 10, :o1, 52375497907, 21600
-          tz.transition 1927, 5, :o2, 52380336307, 21600
-          tz.transition 1927, 10, :o1, 52383360307, 21600
-          tz.transition 1928, 5, :o2, 52388241907, 21600
-          tz.transition 1928, 10, :o1, 52391373907, 21600
-          tz.transition 1929, 5, :o2, 52396125907, 21600
-          tz.transition 1929, 10, :o1, 52399236307, 21600
-          tz.transition 1930, 5, :o2, 52404009907, 21600
-          tz.transition 1930, 10, :o1, 52407098707, 21600
-          tz.transition 1931, 5, :o2, 52411893907, 21600
-          tz.transition 1931, 10, :o1, 52414961107, 21600
-          tz.transition 1932, 5, :o2, 52419950707, 21600
-          tz.transition 1932, 10, :o1, 52422823507, 21600
-          tz.transition 1933, 5, :o2, 52427683507, 21600
-          tz.transition 1933, 10, :o1, 52430837107, 21600
-          tz.transition 1934, 5, :o2, 52435567507, 21600
-          tz.transition 1934, 10, :o1, 52438699507, 21600
-          tz.transition 1935, 5, :o2, 52443451507, 21600
-          tz.transition 1935, 10, :o1, 52446561907, 21600
-          tz.transition 1936, 5, :o2, 52451357107, 21600
-          tz.transition 1936, 10, :o1, 52454424307, 21600
-          tz.transition 1937, 5, :o2, 52459392307, 21600
-          tz.transition 1937, 6, :o3, 52460253607, 21600
-          tz.transition 1937, 10, :o4, 174874289, 72
-          tz.transition 1938, 5, :o3, 174890417, 72
-          tz.transition 1938, 10, :o4, 174900497, 72
-          tz.transition 1939, 5, :o3, 174916697, 72
-          tz.transition 1939, 10, :o4, 174927209, 72
-          tz.transition 1940, 5, :o5, 174943115, 72
-          tz.transition 1942, 11, :o6, 58335973, 24
-          tz.transition 1943, 3, :o5, 58339501, 24
-          tz.transition 1943, 10, :o6, 58344037, 24
-          tz.transition 1944, 4, :o5, 58348405, 24
-          tz.transition 1944, 10, :o6, 58352773, 24
-          tz.transition 1945, 4, :o5, 58357141, 24
-          tz.transition 1945, 9, :o6, 58361149, 24
-          tz.transition 1977, 4, :o5, 228877200
-          tz.transition 1977, 9, :o6, 243997200
-          tz.transition 1978, 4, :o5, 260326800
-          tz.transition 1978, 10, :o6, 276051600
-          tz.transition 1979, 4, :o5, 291776400
-          tz.transition 1979, 9, :o6, 307501200
-          tz.transition 1980, 4, :o5, 323830800
-          tz.transition 1980, 9, :o6, 338950800
-          tz.transition 1981, 3, :o5, 354675600
-          tz.transition 1981, 9, :o6, 370400400
-          tz.transition 1982, 3, :o5, 386125200
-          tz.transition 1982, 9, :o6, 401850000
-          tz.transition 1983, 3, :o5, 417574800
-          tz.transition 1983, 9, :o6, 433299600
-          tz.transition 1984, 3, :o5, 449024400
-          tz.transition 1984, 9, :o6, 465354000
-          tz.transition 1985, 3, :o5, 481078800
-          tz.transition 1985, 9, :o6, 496803600
-          tz.transition 1986, 3, :o5, 512528400
-          tz.transition 1986, 9, :o6, 528253200
-          tz.transition 1987, 3, :o5, 543978000
-          tz.transition 1987, 9, :o6, 559702800
-          tz.transition 1988, 3, :o5, 575427600
-          tz.transition 1988, 9, :o6, 591152400
-          tz.transition 1989, 3, :o5, 606877200
-          tz.transition 1989, 9, :o6, 622602000
-          tz.transition 1990, 3, :o5, 638326800
-          tz.transition 1990, 9, :o6, 654656400
-          tz.transition 1991, 3, :o5, 670381200
-          tz.transition 1991, 9, :o6, 686106000
-          tz.transition 1992, 3, :o5, 701830800
-          tz.transition 1992, 9, :o6, 717555600
-          tz.transition 1993, 3, :o5, 733280400
-          tz.transition 1993, 9, :o6, 749005200
-          tz.transition 1994, 3, :o5, 764730000
-          tz.transition 1994, 9, :o6, 780454800
-          tz.transition 1995, 3, :o5, 796179600
-          tz.transition 1995, 9, :o6, 811904400
-          tz.transition 1996, 3, :o5, 828234000
-          tz.transition 1996, 10, :o6, 846378000
-          tz.transition 1997, 3, :o5, 859683600
-          tz.transition 1997, 10, :o6, 877827600
-          tz.transition 1998, 3, :o5, 891133200
-          tz.transition 1998, 10, :o6, 909277200
-          tz.transition 1999, 3, :o5, 922582800
-          tz.transition 1999, 10, :o6, 941331600
-          tz.transition 2000, 3, :o5, 954032400
-          tz.transition 2000, 10, :o6, 972781200
-          tz.transition 2001, 3, :o5, 985482000
-          tz.transition 2001, 10, :o6, 1004230800
-          tz.transition 2002, 3, :o5, 1017536400
-          tz.transition 2002, 10, :o6, 1035680400
-          tz.transition 2003, 3, :o5, 1048986000
-          tz.transition 2003, 10, :o6, 1067130000
-          tz.transition 2004, 3, :o5, 1080435600
-          tz.transition 2004, 10, :o6, 1099184400
-          tz.transition 2005, 3, :o5, 1111885200
-          tz.transition 2005, 10, :o6, 1130634000
-          tz.transition 2006, 3, :o5, 1143334800
-          tz.transition 2006, 10, :o6, 1162083600
-          tz.transition 2007, 3, :o5, 1174784400
-          tz.transition 2007, 10, :o6, 1193533200
-          tz.transition 2008, 3, :o5, 1206838800
-          tz.transition 2008, 10, :o6, 1224982800
-          tz.transition 2009, 3, :o5, 1238288400
-          tz.transition 2009, 10, :o6, 1256432400
-          tz.transition 2010, 3, :o5, 1269738000
-          tz.transition 2010, 10, :o6, 1288486800
-          tz.transition 2011, 3, :o5, 1301187600
-          tz.transition 2011, 10, :o6, 1319936400
-          tz.transition 2012, 3, :o5, 1332637200
-          tz.transition 2012, 10, :o6, 1351386000
-          tz.transition 2013, 3, :o5, 1364691600
-          tz.transition 2013, 10, :o6, 1382835600
-          tz.transition 2014, 3, :o5, 1396141200
-          tz.transition 2014, 10, :o6, 1414285200
-          tz.transition 2015, 3, :o5, 1427590800
-          tz.transition 2015, 10, :o6, 1445734800
-          tz.transition 2016, 3, :o5, 1459040400
-          tz.transition 2016, 10, :o6, 1477789200
-          tz.transition 2017, 3, :o5, 1490490000
-          tz.transition 2017, 10, :o6, 1509238800
-          tz.transition 2018, 3, :o5, 1521939600
-          tz.transition 2018, 10, :o6, 1540688400
-          tz.transition 2019, 3, :o5, 1553994000
-          tz.transition 2019, 10, :o6, 1572138000
-          tz.transition 2020, 3, :o5, 1585443600
-          tz.transition 2020, 10, :o6, 1603587600
-          tz.transition 2021, 3, :o5, 1616893200
-          tz.transition 2021, 10, :o6, 1635642000
-          tz.transition 2022, 3, :o5, 1648342800
-          tz.transition 2022, 10, :o6, 1667091600
-          tz.transition 2023, 3, :o5, 1679792400
-          tz.transition 2023, 10, :o6, 1698541200
-          tz.transition 2024, 3, :o5, 1711846800
-          tz.transition 2024, 10, :o6, 1729990800
-          tz.transition 2025, 3, :o5, 1743296400
-          tz.transition 2025, 10, :o6, 1761440400
-          tz.transition 2026, 3, :o5, 1774746000
-          tz.transition 2026, 10, :o6, 1792890000
-          tz.transition 2027, 3, :o5, 1806195600
-          tz.transition 2027, 10, :o6, 1824944400
-          tz.transition 2028, 3, :o5, 1837645200
-          tz.transition 2028, 10, :o6, 1856394000
-          tz.transition 2029, 3, :o5, 1869094800
-          tz.transition 2029, 10, :o6, 1887843600
-          tz.transition 2030, 3, :o5, 1901149200
-          tz.transition 2030, 10, :o6, 1919293200
-          tz.transition 2031, 3, :o5, 1932598800
-          tz.transition 2031, 10, :o6, 1950742800
-          tz.transition 2032, 3, :o5, 1964048400
-          tz.transition 2032, 10, :o6, 1982797200
-          tz.transition 2033, 3, :o5, 1995498000
-          tz.transition 2033, 10, :o6, 2014246800
-          tz.transition 2034, 3, :o5, 2026947600
-          tz.transition 2034, 10, :o6, 2045696400
-          tz.transition 2035, 3, :o5, 2058397200
-          tz.transition 2035, 10, :o6, 2077146000
-          tz.transition 2036, 3, :o5, 2090451600
-          tz.transition 2036, 10, :o6, 2108595600
-          tz.transition 2037, 3, :o5, 2121901200
-          tz.transition 2037, 10, :o6, 2140045200
-          tz.transition 2038, 3, :o5, 59172253, 24
-          tz.transition 2038, 10, :o6, 59177461, 24
-          tz.transition 2039, 3, :o5, 59180989, 24
-          tz.transition 2039, 10, :o6, 59186197, 24
-          tz.transition 2040, 3, :o5, 59189725, 24
-          tz.transition 2040, 10, :o6, 59194933, 24
-          tz.transition 2041, 3, :o5, 59198629, 24
-          tz.transition 2041, 10, :o6, 59203669, 24
-          tz.transition 2042, 3, :o5, 59207365, 24
-          tz.transition 2042, 10, :o6, 59212405, 24
-          tz.transition 2043, 3, :o5, 59216101, 24
-          tz.transition 2043, 10, :o6, 59221141, 24
-          tz.transition 2044, 3, :o5, 59224837, 24
-          tz.transition 2044, 10, :o6, 59230045, 24
-          tz.transition 2045, 3, :o5, 59233573, 24
-          tz.transition 2045, 10, :o6, 59238781, 24
-          tz.transition 2046, 3, :o5, 59242309, 24
-          tz.transition 2046, 10, :o6, 59247517, 24
-          tz.transition 2047, 3, :o5, 59251213, 24
-          tz.transition 2047, 10, :o6, 59256253, 24
-          tz.transition 2048, 3, :o5, 59259949, 24
-          tz.transition 2048, 10, :o6, 59264989, 24
-          tz.transition 2049, 3, :o5, 59268685, 24
-          tz.transition 2049, 10, :o6, 59273893, 24
-          tz.transition 2050, 3, :o5, 59277421, 24
-          tz.transition 2050, 10, :o6, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Athens.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Athens.rb
deleted file mode 100644
index 4e21e535ca..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Athens.rb
+++ /dev/null
@@ -1,185 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Athens
-        include TimezoneDefinition
-        
-        timezone 'Europe/Athens' do |tz|
-          tz.offset :o0, 5692, 0, :LMT
-          tz.offset :o1, 5692, 0, :AMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 7200, 3600, :EEST
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 3600, 0, :CET
-          
-          tz.transition 1895, 9, :o1, 52130529377, 21600
-          tz.transition 1916, 7, :o2, 3268447787, 1350
-          tz.transition 1932, 7, :o3, 29122745, 12
-          tz.transition 1932, 8, :o2, 19415611, 8
-          tz.transition 1941, 4, :o3, 29161097, 12
-          tz.transition 1941, 4, :o4, 19440915, 8
-          tz.transition 1942, 11, :o5, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339523, 24
-          tz.transition 1943, 10, :o5, 29172017, 12
-          tz.transition 1944, 4, :o2, 58348427, 24
-          tz.transition 1952, 6, :o3, 29210333, 12
-          tz.transition 1952, 11, :o2, 19474547, 8
-          tz.transition 1975, 4, :o3, 166485600
-          tz.transition 1975, 11, :o2, 186184800
-          tz.transition 1976, 4, :o3, 198028800
-          tz.transition 1976, 10, :o2, 213753600
-          tz.transition 1977, 4, :o3, 228873600
-          tz.transition 1977, 9, :o2, 244080000
-          tz.transition 1978, 4, :o3, 260323200
-          tz.transition 1978, 9, :o2, 275446800
-          tz.transition 1979, 4, :o3, 291798000
-          tz.transition 1979, 9, :o2, 307407600
-          tz.transition 1980, 3, :o3, 323388000
-          tz.transition 1980, 9, :o2, 338936400
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Belgrade.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Belgrade.rb
deleted file mode 100644
index 4dbd893d75..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Belgrade.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Belgrade
-        include TimezoneDefinition
-        
-        timezone 'Europe/Belgrade' do |tz|
-          tz.offset :o0, 4920, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          
-          tz.transition 1883, 12, :o1, 1734607039, 720
-          tz.transition 1941, 4, :o2, 29161241, 12
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 10, :o1, 58344037, 24
-          tz.transition 1944, 4, :o2, 58348405, 24
-          tz.transition 1944, 10, :o1, 58352773, 24
-          tz.transition 1945, 5, :o2, 58358005, 24
-          tz.transition 1945, 9, :o1, 58361149, 24
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Berlin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Berlin.rb
deleted file mode 100644
index 721054236c..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Berlin.rb
+++ /dev/null
@@ -1,188 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Berlin
-        include TimezoneDefinition
-        
-        timezone 'Europe/Berlin' do |tz|
-          tz.offset :o0, 3208, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          tz.offset :o3, 3600, 7200, :CEMT
-          
-          tz.transition 1893, 3, :o1, 26055588199, 10800
-          tz.transition 1916, 4, :o2, 29051813, 12
-          tz.transition 1916, 9, :o1, 58107299, 24
-          tz.transition 1917, 4, :o2, 58112029, 24
-          tz.transition 1917, 9, :o1, 58115725, 24
-          tz.transition 1918, 4, :o2, 58120765, 24
-          tz.transition 1918, 9, :o1, 58124461, 24
-          tz.transition 1940, 4, :o2, 58313293, 24
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 10, :o1, 58344037, 24
-          tz.transition 1944, 4, :o2, 58348405, 24
-          tz.transition 1944, 10, :o1, 58352773, 24
-          tz.transition 1945, 4, :o2, 58357141, 24
-          tz.transition 1945, 5, :o3, 4863199, 2
-          tz.transition 1945, 9, :o2, 4863445, 2
-          tz.transition 1945, 11, :o1, 58362661, 24
-          tz.transition 1946, 4, :o2, 58366189, 24
-          tz.transition 1946, 10, :o1, 58370413, 24
-          tz.transition 1947, 4, :o2, 29187379, 12
-          tz.transition 1947, 5, :o3, 58375597, 24
-          tz.transition 1947, 6, :o2, 4864731, 2
-          tz.transition 1947, 10, :o1, 58379125, 24
-          tz.transition 1948, 4, :o2, 58383829, 24
-          tz.transition 1948, 10, :o1, 58387861, 24
-          tz.transition 1949, 4, :o2, 58392397, 24
-          tz.transition 1949, 10, :o1, 58396597, 24
-          tz.transition 1980, 4, :o2, 323830800
-          tz.transition 1980, 9, :o1, 338950800
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Bratislava.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Bratislava.rb
deleted file mode 100644
index 7a731a0b6a..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Bratislava.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Bratislava
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Bratislava', 'Europe/Prague'
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Brussels.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Brussels.rb
deleted file mode 100644
index 6b0a242944..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Brussels.rb
+++ /dev/null
@@ -1,232 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Brussels
-        include TimezoneDefinition
-        
-        timezone 'Europe/Brussels' do |tz|
-          tz.offset :o0, 1050, 0, :LMT
-          tz.offset :o1, 1050, 0, :BMT
-          tz.offset :o2, 0, 0, :WET
-          tz.offset :o3, 3600, 0, :CET
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 0, 3600, :WEST
-          
-          tz.transition 1879, 12, :o1, 1386844121, 576
-          tz.transition 1892, 5, :o2, 1389438713, 576
-          tz.transition 1914, 11, :o3, 4840889, 2
-          tz.transition 1916, 4, :o4, 58103627, 24
-          tz.transition 1916, 9, :o3, 58107299, 24
-          tz.transition 1917, 4, :o4, 58112029, 24
-          tz.transition 1917, 9, :o3, 58115725, 24
-          tz.transition 1918, 4, :o4, 58120765, 24
-          tz.transition 1918, 9, :o3, 58124461, 24
-          tz.transition 1918, 11, :o2, 58125815, 24
-          tz.transition 1919, 3, :o5, 58128467, 24
-          tz.transition 1919, 10, :o2, 58133675, 24
-          tz.transition 1920, 2, :o5, 58136867, 24
-          tz.transition 1920, 10, :o2, 58142915, 24
-          tz.transition 1921, 3, :o5, 58146323, 24
-          tz.transition 1921, 10, :o2, 58151723, 24
-          tz.transition 1922, 3, :o5, 58155347, 24
-          tz.transition 1922, 10, :o2, 58160051, 24
-          tz.transition 1923, 4, :o5, 58164755, 24
-          tz.transition 1923, 10, :o2, 58168787, 24
-          tz.transition 1924, 3, :o5, 58172987, 24
-          tz.transition 1924, 10, :o2, 58177523, 24
-          tz.transition 1925, 4, :o5, 58181891, 24
-          tz.transition 1925, 10, :o2, 58186259, 24
-          tz.transition 1926, 4, :o5, 58190963, 24
-          tz.transition 1926, 10, :o2, 58194995, 24
-          tz.transition 1927, 4, :o5, 58199531, 24
-          tz.transition 1927, 10, :o2, 58203731, 24
-          tz.transition 1928, 4, :o5, 58208435, 24
-          tz.transition 1928, 10, :o2, 29106319, 12
-          tz.transition 1929, 4, :o5, 29108671, 12
-          tz.transition 1929, 10, :o2, 29110687, 12
-          tz.transition 1930, 4, :o5, 29112955, 12
-          tz.transition 1930, 10, :o2, 29115055, 12
-          tz.transition 1931, 4, :o5, 29117407, 12
-          tz.transition 1931, 10, :o2, 29119423, 12
-          tz.transition 1932, 4, :o5, 29121607, 12
-          tz.transition 1932, 10, :o2, 29123791, 12
-          tz.transition 1933, 3, :o5, 29125891, 12
-          tz.transition 1933, 10, :o2, 29128243, 12
-          tz.transition 1934, 4, :o5, 29130427, 12
-          tz.transition 1934, 10, :o2, 29132611, 12
-          tz.transition 1935, 3, :o5, 29134711, 12
-          tz.transition 1935, 10, :o2, 29136979, 12
-          tz.transition 1936, 4, :o5, 29139331, 12
-          tz.transition 1936, 10, :o2, 29141347, 12
-          tz.transition 1937, 4, :o5, 29143531, 12
-          tz.transition 1937, 10, :o2, 29145715, 12
-          tz.transition 1938, 3, :o5, 29147815, 12
-          tz.transition 1938, 10, :o2, 29150083, 12
-          tz.transition 1939, 4, :o5, 29152435, 12
-          tz.transition 1939, 11, :o2, 29155039, 12
-          tz.transition 1940, 2, :o5, 29156215, 12
-          tz.transition 1940, 5, :o4, 29157235, 12
-          tz.transition 1942, 11, :o3, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o3, 58344037, 24
-          tz.transition 1944, 4, :o4, 58348405, 24
-          tz.transition 1944, 9, :o3, 58352413, 24
-          tz.transition 1945, 4, :o4, 58357141, 24
-          tz.transition 1945, 9, :o3, 58361149, 24
-          tz.transition 1946, 5, :o4, 58367029, 24
-          tz.transition 1946, 10, :o3, 58370413, 24
-          tz.transition 1977, 4, :o4, 228877200
-          tz.transition 1977, 9, :o3, 243997200
-          tz.transition 1978, 4, :o4, 260326800
-          tz.transition 1978, 10, :o3, 276051600
-          tz.transition 1979, 4, :o4, 291776400
-          tz.transition 1979, 9, :o3, 307501200
-          tz.transition 1980, 4, :o4, 323830800
-          tz.transition 1980, 9, :o3, 338950800
-          tz.transition 1981, 3, :o4, 354675600
-          tz.transition 1981, 9, :o3, 370400400
-          tz.transition 1982, 3, :o4, 386125200
-          tz.transition 1982, 9, :o3, 401850000
-          tz.transition 1983, 3, :o4, 417574800
-          tz.transition 1983, 9, :o3, 433299600
-          tz.transition 1984, 3, :o4, 449024400
-          tz.transition 1984, 9, :o3, 465354000
-          tz.transition 1985, 3, :o4, 481078800
-          tz.transition 1985, 9, :o3, 496803600
-          tz.transition 1986, 3, :o4, 512528400
-          tz.transition 1986, 9, :o3, 528253200
-          tz.transition 1987, 3, :o4, 543978000
-          tz.transition 1987, 9, :o3, 559702800
-          tz.transition 1988, 3, :o4, 575427600
-          tz.transition 1988, 9, :o3, 591152400
-          tz.transition 1989, 3, :o4, 606877200
-          tz.transition 1989, 9, :o3, 622602000
-          tz.transition 1990, 3, :o4, 638326800
-          tz.transition 1990, 9, :o3, 654656400
-          tz.transition 1991, 3, :o4, 670381200
-          tz.transition 1991, 9, :o3, 686106000
-          tz.transition 1992, 3, :o4, 701830800
-          tz.transition 1992, 9, :o3, 717555600
-          tz.transition 1993, 3, :o4, 733280400
-          tz.transition 1993, 9, :o3, 749005200
-          tz.transition 1994, 3, :o4, 764730000
-          tz.transition 1994, 9, :o3, 780454800
-          tz.transition 1995, 3, :o4, 796179600
-          tz.transition 1995, 9, :o3, 811904400
-          tz.transition 1996, 3, :o4, 828234000
-          tz.transition 1996, 10, :o3, 846378000
-          tz.transition 1997, 3, :o4, 859683600
-          tz.transition 1997, 10, :o3, 877827600
-          tz.transition 1998, 3, :o4, 891133200
-          tz.transition 1998, 10, :o3, 909277200
-          tz.transition 1999, 3, :o4, 922582800
-          tz.transition 1999, 10, :o3, 941331600
-          tz.transition 2000, 3, :o4, 954032400
-          tz.transition 2000, 10, :o3, 972781200
-          tz.transition 2001, 3, :o4, 985482000
-          tz.transition 2001, 10, :o3, 1004230800
-          tz.transition 2002, 3, :o4, 1017536400
-          tz.transition 2002, 10, :o3, 1035680400
-          tz.transition 2003, 3, :o4, 1048986000
-          tz.transition 2003, 10, :o3, 1067130000
-          tz.transition 2004, 3, :o4, 1080435600
-          tz.transition 2004, 10, :o3, 1099184400
-          tz.transition 2005, 3, :o4, 1111885200
-          tz.transition 2005, 10, :o3, 1130634000
-          tz.transition 2006, 3, :o4, 1143334800
-          tz.transition 2006, 10, :o3, 1162083600
-          tz.transition 2007, 3, :o4, 1174784400
-          tz.transition 2007, 10, :o3, 1193533200
-          tz.transition 2008, 3, :o4, 1206838800
-          tz.transition 2008, 10, :o3, 1224982800
-          tz.transition 2009, 3, :o4, 1238288400
-          tz.transition 2009, 10, :o3, 1256432400
-          tz.transition 2010, 3, :o4, 1269738000
-          tz.transition 2010, 10, :o3, 1288486800
-          tz.transition 2011, 3, :o4, 1301187600
-          tz.transition 2011, 10, :o3, 1319936400
-          tz.transition 2012, 3, :o4, 1332637200
-          tz.transition 2012, 10, :o3, 1351386000
-          tz.transition 2013, 3, :o4, 1364691600
-          tz.transition 2013, 10, :o3, 1382835600
-          tz.transition 2014, 3, :o4, 1396141200
-          tz.transition 2014, 10, :o3, 1414285200
-          tz.transition 2015, 3, :o4, 1427590800
-          tz.transition 2015, 10, :o3, 1445734800
-          tz.transition 2016, 3, :o4, 1459040400
-          tz.transition 2016, 10, :o3, 1477789200
-          tz.transition 2017, 3, :o4, 1490490000
-          tz.transition 2017, 10, :o3, 1509238800
-          tz.transition 2018, 3, :o4, 1521939600
-          tz.transition 2018, 10, :o3, 1540688400
-          tz.transition 2019, 3, :o4, 1553994000
-          tz.transition 2019, 10, :o3, 1572138000
-          tz.transition 2020, 3, :o4, 1585443600
-          tz.transition 2020, 10, :o3, 1603587600
-          tz.transition 2021, 3, :o4, 1616893200
-          tz.transition 2021, 10, :o3, 1635642000
-          tz.transition 2022, 3, :o4, 1648342800
-          tz.transition 2022, 10, :o3, 1667091600
-          tz.transition 2023, 3, :o4, 1679792400
-          tz.transition 2023, 10, :o3, 1698541200
-          tz.transition 2024, 3, :o4, 1711846800
-          tz.transition 2024, 10, :o3, 1729990800
-          tz.transition 2025, 3, :o4, 1743296400
-          tz.transition 2025, 10, :o3, 1761440400
-          tz.transition 2026, 3, :o4, 1774746000
-          tz.transition 2026, 10, :o3, 1792890000
-          tz.transition 2027, 3, :o4, 1806195600
-          tz.transition 2027, 10, :o3, 1824944400
-          tz.transition 2028, 3, :o4, 1837645200
-          tz.transition 2028, 10, :o3, 1856394000
-          tz.transition 2029, 3, :o4, 1869094800
-          tz.transition 2029, 10, :o3, 1887843600
-          tz.transition 2030, 3, :o4, 1901149200
-          tz.transition 2030, 10, :o3, 1919293200
-          tz.transition 2031, 3, :o4, 1932598800
-          tz.transition 2031, 10, :o3, 1950742800
-          tz.transition 2032, 3, :o4, 1964048400
-          tz.transition 2032, 10, :o3, 1982797200
-          tz.transition 2033, 3, :o4, 1995498000
-          tz.transition 2033, 10, :o3, 2014246800
-          tz.transition 2034, 3, :o4, 2026947600
-          tz.transition 2034, 10, :o3, 2045696400
-          tz.transition 2035, 3, :o4, 2058397200
-          tz.transition 2035, 10, :o3, 2077146000
-          tz.transition 2036, 3, :o4, 2090451600
-          tz.transition 2036, 10, :o3, 2108595600
-          tz.transition 2037, 3, :o4, 2121901200
-          tz.transition 2037, 10, :o3, 2140045200
-          tz.transition 2038, 3, :o4, 59172253, 24
-          tz.transition 2038, 10, :o3, 59177461, 24
-          tz.transition 2039, 3, :o4, 59180989, 24
-          tz.transition 2039, 10, :o3, 59186197, 24
-          tz.transition 2040, 3, :o4, 59189725, 24
-          tz.transition 2040, 10, :o3, 59194933, 24
-          tz.transition 2041, 3, :o4, 59198629, 24
-          tz.transition 2041, 10, :o3, 59203669, 24
-          tz.transition 2042, 3, :o4, 59207365, 24
-          tz.transition 2042, 10, :o3, 59212405, 24
-          tz.transition 2043, 3, :o4, 59216101, 24
-          tz.transition 2043, 10, :o3, 59221141, 24
-          tz.transition 2044, 3, :o4, 59224837, 24
-          tz.transition 2044, 10, :o3, 59230045, 24
-          tz.transition 2045, 3, :o4, 59233573, 24
-          tz.transition 2045, 10, :o3, 59238781, 24
-          tz.transition 2046, 3, :o4, 59242309, 24
-          tz.transition 2046, 10, :o3, 59247517, 24
-          tz.transition 2047, 3, :o4, 59251213, 24
-          tz.transition 2047, 10, :o3, 59256253, 24
-          tz.transition 2048, 3, :o4, 59259949, 24
-          tz.transition 2048, 10, :o3, 59264989, 24
-          tz.transition 2049, 3, :o4, 59268685, 24
-          tz.transition 2049, 10, :o3, 59273893, 24
-          tz.transition 2050, 3, :o4, 59277421, 24
-          tz.transition 2050, 10, :o3, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Bucharest.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Bucharest.rb
deleted file mode 100644
index 521c3c932e..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Bucharest.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Bucharest
-        include TimezoneDefinition
-        
-        timezone 'Europe/Bucharest' do |tz|
-          tz.offset :o0, 6264, 0, :LMT
-          tz.offset :o1, 6264, 0, :BMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 7200, 3600, :EEST
-          
-          tz.transition 1891, 9, :o1, 964802571, 400
-          tz.transition 1931, 7, :o2, 970618571, 400
-          tz.transition 1932, 5, :o3, 29122181, 12
-          tz.transition 1932, 10, :o2, 29123789, 12
-          tz.transition 1933, 4, :o3, 29125973, 12
-          tz.transition 1933, 9, :o2, 29128157, 12
-          tz.transition 1934, 4, :o3, 29130425, 12
-          tz.transition 1934, 10, :o2, 29132609, 12
-          tz.transition 1935, 4, :o3, 29134793, 12
-          tz.transition 1935, 10, :o2, 29136977, 12
-          tz.transition 1936, 4, :o3, 29139161, 12
-          tz.transition 1936, 10, :o2, 29141345, 12
-          tz.transition 1937, 4, :o3, 29143529, 12
-          tz.transition 1937, 10, :o2, 29145713, 12
-          tz.transition 1938, 4, :o3, 29147897, 12
-          tz.transition 1938, 10, :o2, 29150081, 12
-          tz.transition 1939, 4, :o3, 29152265, 12
-          tz.transition 1939, 9, :o2, 29154449, 12
-          tz.transition 1979, 5, :o3, 296604000
-          tz.transition 1979, 9, :o2, 307486800
-          tz.transition 1980, 4, :o3, 323816400
-          tz.transition 1980, 9, :o2, 338940000
-          tz.transition 1981, 3, :o3, 354672000
-          tz.transition 1981, 9, :o2, 370396800
-          tz.transition 1982, 3, :o3, 386121600
-          tz.transition 1982, 9, :o2, 401846400
-          tz.transition 1983, 3, :o3, 417571200
-          tz.transition 1983, 9, :o2, 433296000
-          tz.transition 1984, 3, :o3, 449020800
-          tz.transition 1984, 9, :o2, 465350400
-          tz.transition 1985, 3, :o3, 481075200
-          tz.transition 1985, 9, :o2, 496800000
-          tz.transition 1986, 3, :o3, 512524800
-          tz.transition 1986, 9, :o2, 528249600
-          tz.transition 1987, 3, :o3, 543974400
-          tz.transition 1987, 9, :o2, 559699200
-          tz.transition 1988, 3, :o3, 575424000
-          tz.transition 1988, 9, :o2, 591148800
-          tz.transition 1989, 3, :o3, 606873600
-          tz.transition 1989, 9, :o2, 622598400
-          tz.transition 1990, 3, :o3, 638323200
-          tz.transition 1990, 9, :o2, 654652800
-          tz.transition 1991, 3, :o3, 670370400
-          tz.transition 1991, 9, :o2, 686095200
-          tz.transition 1992, 3, :o3, 701820000
-          tz.transition 1992, 9, :o2, 717544800
-          tz.transition 1993, 3, :o3, 733269600
-          tz.transition 1993, 9, :o2, 748994400
-          tz.transition 1994, 3, :o3, 764719200
-          tz.transition 1994, 9, :o2, 780440400
-          tz.transition 1995, 3, :o3, 796168800
-          tz.transition 1995, 9, :o2, 811890000
-          tz.transition 1996, 3, :o3, 828223200
-          tz.transition 1996, 10, :o2, 846363600
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Budapest.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Budapest.rb
deleted file mode 100644
index 1f3a9738b7..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Budapest.rb
+++ /dev/null
@@ -1,197 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Budapest
-        include TimezoneDefinition
-        
-        timezone 'Europe/Budapest' do |tz|
-          tz.offset :o0, 4580, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          
-          tz.transition 1890, 9, :o1, 10418291051, 4320
-          tz.transition 1916, 4, :o2, 29051813, 12
-          tz.transition 1916, 9, :o1, 58107299, 24
-          tz.transition 1917, 4, :o2, 58112029, 24
-          tz.transition 1917, 9, :o1, 58115725, 24
-          tz.transition 1918, 4, :o2, 29060215, 12
-          tz.transition 1918, 9, :o1, 58124773, 24
-          tz.transition 1919, 4, :o2, 29064763, 12
-          tz.transition 1919, 9, :o1, 58133197, 24
-          tz.transition 1920, 4, :o2, 29069035, 12
-          tz.transition 1920, 9, :o1, 58142341, 24
-          tz.transition 1941, 4, :o2, 58322173, 24
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 10, :o1, 58344037, 24
-          tz.transition 1944, 4, :o2, 58348405, 24
-          tz.transition 1944, 10, :o1, 58352773, 24
-          tz.transition 1945, 5, :o2, 29178929, 12
-          tz.transition 1945, 11, :o1, 29181149, 12
-          tz.transition 1946, 3, :o2, 58365853, 24
-          tz.transition 1946, 10, :o1, 58370389, 24
-          tz.transition 1947, 4, :o2, 58374757, 24
-          tz.transition 1947, 10, :o1, 58379125, 24
-          tz.transition 1948, 4, :o2, 58383493, 24
-          tz.transition 1948, 10, :o1, 58387861, 24
-          tz.transition 1949, 4, :o2, 58392397, 24
-          tz.transition 1949, 10, :o1, 58396597, 24
-          tz.transition 1950, 4, :o2, 58401325, 24
-          tz.transition 1950, 10, :o1, 58405861, 24
-          tz.transition 1954, 5, :o2, 58437251, 24
-          tz.transition 1954, 10, :o1, 29220221, 12
-          tz.transition 1955, 5, :o2, 58446011, 24
-          tz.transition 1955, 10, :o1, 29224601, 12
-          tz.transition 1956, 6, :o2, 58455059, 24
-          tz.transition 1956, 9, :o1, 29228957, 12
-          tz.transition 1957, 6, :o2, 4871983, 2
-          tz.transition 1957, 9, :o1, 58466653, 24
-          tz.transition 1980, 4, :o2, 323827200
-          tz.transition 1980, 9, :o1, 338950800
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Copenhagen.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Copenhagen.rb
deleted file mode 100644
index 47cbaf14a7..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Copenhagen.rb
+++ /dev/null
@@ -1,179 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Copenhagen
-        include TimezoneDefinition
-        
-        timezone 'Europe/Copenhagen' do |tz|
-          tz.offset :o0, 3020, 0, :LMT
-          tz.offset :o1, 3020, 0, :CMT
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          
-          tz.transition 1889, 12, :o1, 10417111769, 4320
-          tz.transition 1893, 12, :o2, 10423423289, 4320
-          tz.transition 1916, 5, :o3, 29051981, 12
-          tz.transition 1916, 9, :o2, 19369099, 8
-          tz.transition 1940, 5, :o3, 58314347, 24
-          tz.transition 1942, 11, :o2, 58335973, 24
-          tz.transition 1943, 3, :o3, 58339501, 24
-          tz.transition 1943, 10, :o2, 58344037, 24
-          tz.transition 1944, 4, :o3, 58348405, 24
-          tz.transition 1944, 10, :o2, 58352773, 24
-          tz.transition 1945, 4, :o3, 58357141, 24
-          tz.transition 1945, 8, :o2, 58360381, 24
-          tz.transition 1946, 5, :o3, 58366597, 24
-          tz.transition 1946, 9, :o2, 58369549, 24
-          tz.transition 1947, 5, :o3, 58375429, 24
-          tz.transition 1947, 8, :o2, 58377781, 24
-          tz.transition 1948, 5, :o3, 58384333, 24
-          tz.transition 1948, 8, :o2, 58386517, 24
-          tz.transition 1980, 4, :o3, 323830800
-          tz.transition 1980, 9, :o2, 338950800
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Dublin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Dublin.rb
deleted file mode 100644
index 0560bb5436..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Dublin.rb
+++ /dev/null
@@ -1,276 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Dublin
-        include TimezoneDefinition
-        
-        timezone 'Europe/Dublin' do |tz|
-          tz.offset :o0, -1500, 0, :LMT
-          tz.offset :o1, -1521, 0, :DMT
-          tz.offset :o2, -1521, 3600, :IST
-          tz.offset :o3, 0, 0, :GMT
-          tz.offset :o4, 0, 3600, :BST
-          tz.offset :o5, 0, 3600, :IST
-          tz.offset :o6, 3600, 0, :IST
-          
-          tz.transition 1880, 8, :o1, 693483701, 288
-          tz.transition 1916, 5, :o2, 7747214723, 3200
-          tz.transition 1916, 10, :o3, 7747640323, 3200
-          tz.transition 1917, 4, :o4, 29055919, 12
-          tz.transition 1917, 9, :o3, 29057863, 12
-          tz.transition 1918, 3, :o4, 29060119, 12
-          tz.transition 1918, 9, :o3, 29062399, 12
-          tz.transition 1919, 3, :o4, 29064571, 12
-          tz.transition 1919, 9, :o3, 29066767, 12
-          tz.transition 1920, 3, :o4, 29068939, 12
-          tz.transition 1920, 10, :o3, 29071471, 12
-          tz.transition 1921, 4, :o4, 29073391, 12
-          tz.transition 1921, 10, :o3, 29075587, 12
-          tz.transition 1922, 3, :o5, 29077675, 12
-          tz.transition 1922, 10, :o3, 29080027, 12
-          tz.transition 1923, 4, :o5, 29082379, 12
-          tz.transition 1923, 9, :o3, 29084143, 12
-          tz.transition 1924, 4, :o5, 29086663, 12
-          tz.transition 1924, 9, :o3, 29088595, 12
-          tz.transition 1925, 4, :o5, 29091115, 12
-          tz.transition 1925, 10, :o3, 29093131, 12
-          tz.transition 1926, 4, :o5, 29095483, 12
-          tz.transition 1926, 10, :o3, 29097499, 12
-          tz.transition 1927, 4, :o5, 29099767, 12
-          tz.transition 1927, 10, :o3, 29101867, 12
-          tz.transition 1928, 4, :o5, 29104303, 12
-          tz.transition 1928, 10, :o3, 29106319, 12
-          tz.transition 1929, 4, :o5, 29108671, 12
-          tz.transition 1929, 10, :o3, 29110687, 12
-          tz.transition 1930, 4, :o5, 29112955, 12
-          tz.transition 1930, 10, :o3, 29115055, 12
-          tz.transition 1931, 4, :o5, 29117407, 12
-          tz.transition 1931, 10, :o3, 29119423, 12
-          tz.transition 1932, 4, :o5, 29121775, 12
-          tz.transition 1932, 10, :o3, 29123791, 12
-          tz.transition 1933, 4, :o5, 29126059, 12
-          tz.transition 1933, 10, :o3, 29128243, 12
-          tz.transition 1934, 4, :o5, 29130595, 12
-          tz.transition 1934, 10, :o3, 29132611, 12
-          tz.transition 1935, 4, :o5, 29134879, 12
-          tz.transition 1935, 10, :o3, 29136979, 12
-          tz.transition 1936, 4, :o5, 29139331, 12
-          tz.transition 1936, 10, :o3, 29141347, 12
-          tz.transition 1937, 4, :o5, 29143699, 12
-          tz.transition 1937, 10, :o3, 29145715, 12
-          tz.transition 1938, 4, :o5, 29147983, 12
-          tz.transition 1938, 10, :o3, 29150083, 12
-          tz.transition 1939, 4, :o5, 29152435, 12
-          tz.transition 1939, 11, :o3, 29155039, 12
-          tz.transition 1940, 2, :o5, 29156215, 12
-          tz.transition 1946, 10, :o3, 58370389, 24
-          tz.transition 1947, 3, :o5, 29187127, 12
-          tz.transition 1947, 11, :o3, 58379797, 24
-          tz.transition 1948, 4, :o5, 29191915, 12
-          tz.transition 1948, 10, :o3, 29194267, 12
-          tz.transition 1949, 4, :o5, 29196115, 12
-          tz.transition 1949, 10, :o3, 29198635, 12
-          tz.transition 1950, 4, :o5, 29200651, 12
-          tz.transition 1950, 10, :o3, 29202919, 12
-          tz.transition 1951, 4, :o5, 29205019, 12
-          tz.transition 1951, 10, :o3, 29207287, 12
-          tz.transition 1952, 4, :o5, 29209471, 12
-          tz.transition 1952, 10, :o3, 29211739, 12
-          tz.transition 1953, 4, :o5, 29213839, 12
-          tz.transition 1953, 10, :o3, 29215855, 12
-          tz.transition 1954, 4, :o5, 29218123, 12
-          tz.transition 1954, 10, :o3, 29220223, 12
-          tz.transition 1955, 4, :o5, 29222575, 12
-          tz.transition 1955, 10, :o3, 29224591, 12
-          tz.transition 1956, 4, :o5, 29227027, 12
-          tz.transition 1956, 10, :o3, 29229043, 12
-          tz.transition 1957, 4, :o5, 29231311, 12
-          tz.transition 1957, 10, :o3, 29233411, 12
-          tz.transition 1958, 4, :o5, 29235763, 12
-          tz.transition 1958, 10, :o3, 29237779, 12
-          tz.transition 1959, 4, :o5, 29240131, 12
-          tz.transition 1959, 10, :o3, 29242147, 12
-          tz.transition 1960, 4, :o5, 29244415, 12
-          tz.transition 1960, 10, :o3, 29246515, 12
-          tz.transition 1961, 3, :o5, 29248615, 12
-          tz.transition 1961, 10, :o3, 29251219, 12
-          tz.transition 1962, 3, :o5, 29252983, 12
-          tz.transition 1962, 10, :o3, 29255587, 12
-          tz.transition 1963, 3, :o5, 29257435, 12
-          tz.transition 1963, 10, :o3, 29259955, 12
-          tz.transition 1964, 3, :o5, 29261719, 12
-          tz.transition 1964, 10, :o3, 29264323, 12
-          tz.transition 1965, 3, :o5, 29266087, 12
-          tz.transition 1965, 10, :o3, 29268691, 12
-          tz.transition 1966, 3, :o5, 29270455, 12
-          tz.transition 1966, 10, :o3, 29273059, 12
-          tz.transition 1967, 3, :o5, 29274823, 12
-          tz.transition 1967, 10, :o3, 29277511, 12
-          tz.transition 1968, 2, :o5, 29278855, 12
-          tz.transition 1968, 10, :o6, 58563755, 24
-          tz.transition 1971, 10, :o3, 57722400
-          tz.transition 1972, 3, :o5, 69818400
-          tz.transition 1972, 10, :o3, 89172000
-          tz.transition 1973, 3, :o5, 101268000
-          tz.transition 1973, 10, :o3, 120621600
-          tz.transition 1974, 3, :o5, 132717600
-          tz.transition 1974, 10, :o3, 152071200
-          tz.transition 1975, 3, :o5, 164167200
-          tz.transition 1975, 10, :o3, 183520800
-          tz.transition 1976, 3, :o5, 196221600
-          tz.transition 1976, 10, :o3, 214970400
-          tz.transition 1977, 3, :o5, 227671200
-          tz.transition 1977, 10, :o3, 246420000
-          tz.transition 1978, 3, :o5, 259120800
-          tz.transition 1978, 10, :o3, 278474400
-          tz.transition 1979, 3, :o5, 290570400
-          tz.transition 1979, 10, :o3, 309924000
-          tz.transition 1980, 3, :o5, 322020000
-          tz.transition 1980, 10, :o3, 341373600
-          tz.transition 1981, 3, :o5, 354675600
-          tz.transition 1981, 10, :o3, 372819600
-          tz.transition 1982, 3, :o5, 386125200
-          tz.transition 1982, 10, :o3, 404269200
-          tz.transition 1983, 3, :o5, 417574800
-          tz.transition 1983, 10, :o3, 435718800
-          tz.transition 1984, 3, :o5, 449024400
-          tz.transition 1984, 10, :o3, 467773200
-          tz.transition 1985, 3, :o5, 481078800
-          tz.transition 1985, 10, :o3, 499222800
-          tz.transition 1986, 3, :o5, 512528400
-          tz.transition 1986, 10, :o3, 530672400
-          tz.transition 1987, 3, :o5, 543978000
-          tz.transition 1987, 10, :o3, 562122000
-          tz.transition 1988, 3, :o5, 575427600
-          tz.transition 1988, 10, :o3, 593571600
-          tz.transition 1989, 3, :o5, 606877200
-          tz.transition 1989, 10, :o3, 625626000
-          tz.transition 1990, 3, :o5, 638326800
-          tz.transition 1990, 10, :o3, 657075600
-          tz.transition 1991, 3, :o5, 670381200
-          tz.transition 1991, 10, :o3, 688525200
-          tz.transition 1992, 3, :o5, 701830800
-          tz.transition 1992, 10, :o3, 719974800
-          tz.transition 1993, 3, :o5, 733280400
-          tz.transition 1993, 10, :o3, 751424400
-          tz.transition 1994, 3, :o5, 764730000
-          tz.transition 1994, 10, :o3, 782874000
-          tz.transition 1995, 3, :o5, 796179600
-          tz.transition 1995, 10, :o3, 814323600
-          tz.transition 1996, 3, :o5, 828234000
-          tz.transition 1996, 10, :o3, 846378000
-          tz.transition 1997, 3, :o5, 859683600
-          tz.transition 1997, 10, :o3, 877827600
-          tz.transition 1998, 3, :o5, 891133200
-          tz.transition 1998, 10, :o3, 909277200
-          tz.transition 1999, 3, :o5, 922582800
-          tz.transition 1999, 10, :o3, 941331600
-          tz.transition 2000, 3, :o5, 954032400
-          tz.transition 2000, 10, :o3, 972781200
-          tz.transition 2001, 3, :o5, 985482000
-          tz.transition 2001, 10, :o3, 1004230800
-          tz.transition 2002, 3, :o5, 1017536400
-          tz.transition 2002, 10, :o3, 1035680400
-          tz.transition 2003, 3, :o5, 1048986000
-          tz.transition 2003, 10, :o3, 1067130000
-          tz.transition 2004, 3, :o5, 1080435600
-          tz.transition 2004, 10, :o3, 1099184400
-          tz.transition 2005, 3, :o5, 1111885200
-          tz.transition 2005, 10, :o3, 1130634000
-          tz.transition 2006, 3, :o5, 1143334800
-          tz.transition 2006, 10, :o3, 1162083600
-          tz.transition 2007, 3, :o5, 1174784400
-          tz.transition 2007, 10, :o3, 1193533200
-          tz.transition 2008, 3, :o5, 1206838800
-          tz.transition 2008, 10, :o3, 1224982800
-          tz.transition 2009, 3, :o5, 1238288400
-          tz.transition 2009, 10, :o3, 1256432400
-          tz.transition 2010, 3, :o5, 1269738000
-          tz.transition 2010, 10, :o3, 1288486800
-          tz.transition 2011, 3, :o5, 1301187600
-          tz.transition 2011, 10, :o3, 1319936400
-          tz.transition 2012, 3, :o5, 1332637200
-          tz.transition 2012, 10, :o3, 1351386000
-          tz.transition 2013, 3, :o5, 1364691600
-          tz.transition 2013, 10, :o3, 1382835600
-          tz.transition 2014, 3, :o5, 1396141200
-          tz.transition 2014, 10, :o3, 1414285200
-          tz.transition 2015, 3, :o5, 1427590800
-          tz.transition 2015, 10, :o3, 1445734800
-          tz.transition 2016, 3, :o5, 1459040400
-          tz.transition 2016, 10, :o3, 1477789200
-          tz.transition 2017, 3, :o5, 1490490000
-          tz.transition 2017, 10, :o3, 1509238800
-          tz.transition 2018, 3, :o5, 1521939600
-          tz.transition 2018, 10, :o3, 1540688400
-          tz.transition 2019, 3, :o5, 1553994000
-          tz.transition 2019, 10, :o3, 1572138000
-          tz.transition 2020, 3, :o5, 1585443600
-          tz.transition 2020, 10, :o3, 1603587600
-          tz.transition 2021, 3, :o5, 1616893200
-          tz.transition 2021, 10, :o3, 1635642000
-          tz.transition 2022, 3, :o5, 1648342800
-          tz.transition 2022, 10, :o3, 1667091600
-          tz.transition 2023, 3, :o5, 1679792400
-          tz.transition 2023, 10, :o3, 1698541200
-          tz.transition 2024, 3, :o5, 1711846800
-          tz.transition 2024, 10, :o3, 1729990800
-          tz.transition 2025, 3, :o5, 1743296400
-          tz.transition 2025, 10, :o3, 1761440400
-          tz.transition 2026, 3, :o5, 1774746000
-          tz.transition 2026, 10, :o3, 1792890000
-          tz.transition 2027, 3, :o5, 1806195600
-          tz.transition 2027, 10, :o3, 1824944400
-          tz.transition 2028, 3, :o5, 1837645200
-          tz.transition 2028, 10, :o3, 1856394000
-          tz.transition 2029, 3, :o5, 1869094800
-          tz.transition 2029, 10, :o3, 1887843600
-          tz.transition 2030, 3, :o5, 1901149200
-          tz.transition 2030, 10, :o3, 1919293200
-          tz.transition 2031, 3, :o5, 1932598800
-          tz.transition 2031, 10, :o3, 1950742800
-          tz.transition 2032, 3, :o5, 1964048400
-          tz.transition 2032, 10, :o3, 1982797200
-          tz.transition 2033, 3, :o5, 1995498000
-          tz.transition 2033, 10, :o3, 2014246800
-          tz.transition 2034, 3, :o5, 2026947600
-          tz.transition 2034, 10, :o3, 2045696400
-          tz.transition 2035, 3, :o5, 2058397200
-          tz.transition 2035, 10, :o3, 2077146000
-          tz.transition 2036, 3, :o5, 2090451600
-          tz.transition 2036, 10, :o3, 2108595600
-          tz.transition 2037, 3, :o5, 2121901200
-          tz.transition 2037, 10, :o3, 2140045200
-          tz.transition 2038, 3, :o5, 59172253, 24
-          tz.transition 2038, 10, :o3, 59177461, 24
-          tz.transition 2039, 3, :o5, 59180989, 24
-          tz.transition 2039, 10, :o3, 59186197, 24
-          tz.transition 2040, 3, :o5, 59189725, 24
-          tz.transition 2040, 10, :o3, 59194933, 24
-          tz.transition 2041, 3, :o5, 59198629, 24
-          tz.transition 2041, 10, :o3, 59203669, 24
-          tz.transition 2042, 3, :o5, 59207365, 24
-          tz.transition 2042, 10, :o3, 59212405, 24
-          tz.transition 2043, 3, :o5, 59216101, 24
-          tz.transition 2043, 10, :o3, 59221141, 24
-          tz.transition 2044, 3, :o5, 59224837, 24
-          tz.transition 2044, 10, :o3, 59230045, 24
-          tz.transition 2045, 3, :o5, 59233573, 24
-          tz.transition 2045, 10, :o3, 59238781, 24
-          tz.transition 2046, 3, :o5, 59242309, 24
-          tz.transition 2046, 10, :o3, 59247517, 24
-          tz.transition 2047, 3, :o5, 59251213, 24
-          tz.transition 2047, 10, :o3, 59256253, 24
-          tz.transition 2048, 3, :o5, 59259949, 24
-          tz.transition 2048, 10, :o3, 59264989, 24
-          tz.transition 2049, 3, :o5, 59268685, 24
-          tz.transition 2049, 10, :o3, 59273893, 24
-          tz.transition 2050, 3, :o5, 59277421, 24
-          tz.transition 2050, 10, :o3, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Helsinki.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Helsinki.rb
deleted file mode 100644
index 13a806bcc7..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Helsinki.rb
+++ /dev/null
@@ -1,163 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Helsinki
-        include TimezoneDefinition
-        
-        timezone 'Europe/Helsinki' do |tz|
-          tz.offset :o0, 5992, 0, :LMT
-          tz.offset :o1, 5992, 0, :HMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 7200, 3600, :EEST
-          
-          tz.transition 1878, 5, :o1, 25997062651, 10800
-          tz.transition 1921, 4, :o2, 26166352651, 10800
-          tz.transition 1942, 4, :o3, 29165429, 12
-          tz.transition 1942, 10, :o2, 19445083, 8
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Istanbul.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Istanbul.rb
deleted file mode 100644
index 8306c47536..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Istanbul.rb
+++ /dev/null
@@ -1,218 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Istanbul
-        include TimezoneDefinition
-        
-        timezone 'Europe/Istanbul' do |tz|
-          tz.offset :o0, 6952, 0, :LMT
-          tz.offset :o1, 7016, 0, :IMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 7200, 3600, :EEST
-          tz.offset :o4, 10800, 3600, :TRST
-          tz.offset :o5, 10800, 0, :TRT
-          
-          tz.transition 1879, 12, :o1, 26003326531, 10800
-          tz.transition 1910, 9, :o2, 26124610523, 10800
-          tz.transition 1916, 4, :o3, 29051813, 12
-          tz.transition 1916, 9, :o2, 19369099, 8
-          tz.transition 1920, 3, :o3, 29068937, 12
-          tz.transition 1920, 10, :o2, 19380979, 8
-          tz.transition 1921, 4, :o3, 29073389, 12
-          tz.transition 1921, 10, :o2, 19383723, 8
-          tz.transition 1922, 3, :o3, 29077673, 12
-          tz.transition 1922, 10, :o2, 19386683, 8
-          tz.transition 1924, 5, :o3, 29087021, 12
-          tz.transition 1924, 9, :o2, 19392475, 8
-          tz.transition 1925, 4, :o3, 29091257, 12
-          tz.transition 1925, 9, :o2, 19395395, 8
-          tz.transition 1940, 6, :o3, 29157725, 12
-          tz.transition 1940, 10, :o2, 19439259, 8
-          tz.transition 1940, 11, :o3, 29159573, 12
-          tz.transition 1941, 9, :o2, 19442067, 8
-          tz.transition 1942, 3, :o3, 29165405, 12
-          tz.transition 1942, 10, :o2, 19445315, 8
-          tz.transition 1945, 4, :o3, 29178569, 12
-          tz.transition 1945, 10, :o2, 19453891, 8
-          tz.transition 1946, 5, :o3, 29183669, 12
-          tz.transition 1946, 9, :o2, 19456755, 8
-          tz.transition 1947, 4, :o3, 29187545, 12
-          tz.transition 1947, 10, :o2, 19459707, 8
-          tz.transition 1948, 4, :o3, 29191913, 12
-          tz.transition 1948, 10, :o2, 19462619, 8
-          tz.transition 1949, 4, :o3, 29196197, 12
-          tz.transition 1949, 10, :o2, 19465531, 8
-          tz.transition 1950, 4, :o3, 29200685, 12
-          tz.transition 1950, 10, :o2, 19468499, 8
-          tz.transition 1951, 4, :o3, 29205101, 12
-          tz.transition 1951, 10, :o2, 19471419, 8
-          tz.transition 1962, 7, :o3, 29254325, 12
-          tz.transition 1962, 10, :o2, 19503563, 8
-          tz.transition 1964, 5, :o3, 29262365, 12
-          tz.transition 1964, 9, :o2, 19509355, 8
-          tz.transition 1970, 5, :o3, 10533600
-          tz.transition 1970, 10, :o2, 23835600
-          tz.transition 1971, 5, :o3, 41983200
-          tz.transition 1971, 10, :o2, 55285200
-          tz.transition 1972, 5, :o3, 74037600
-          tz.transition 1972, 10, :o2, 87339600
-          tz.transition 1973, 6, :o3, 107910000
-          tz.transition 1973, 11, :o2, 121219200
-          tz.transition 1974, 3, :o3, 133920000
-          tz.transition 1974, 11, :o2, 152676000
-          tz.transition 1975, 3, :o3, 165362400
-          tz.transition 1975, 10, :o2, 183502800
-          tz.transition 1976, 5, :o3, 202428000
-          tz.transition 1976, 10, :o2, 215557200
-          tz.transition 1977, 4, :o3, 228866400
-          tz.transition 1977, 10, :o2, 245797200
-          tz.transition 1978, 4, :o3, 260316000
-          tz.transition 1978, 10, :o4, 277246800
-          tz.transition 1979, 10, :o5, 308779200
-          tz.transition 1980, 4, :o4, 323827200
-          tz.transition 1980, 10, :o5, 340228800
-          tz.transition 1981, 3, :o4, 354672000
-          tz.transition 1981, 10, :o5, 371678400
-          tz.transition 1982, 3, :o4, 386121600
-          tz.transition 1982, 10, :o5, 403128000
-          tz.transition 1983, 7, :o4, 428446800
-          tz.transition 1983, 10, :o5, 433886400
-          tz.transition 1985, 4, :o3, 482792400
-          tz.transition 1985, 9, :o2, 496702800
-          tz.transition 1986, 3, :o3, 512524800
-          tz.transition 1986, 9, :o2, 528249600
-          tz.transition 1987, 3, :o3, 543974400
-          tz.transition 1987, 9, :o2, 559699200
-          tz.transition 1988, 3, :o3, 575424000
-          tz.transition 1988, 9, :o2, 591148800
-          tz.transition 1989, 3, :o3, 606873600
-          tz.transition 1989, 9, :o2, 622598400
-          tz.transition 1990, 3, :o3, 638323200
-          tz.transition 1990, 9, :o2, 654652800
-          tz.transition 1991, 3, :o3, 670374000
-          tz.transition 1991, 9, :o2, 686098800
-          tz.transition 1992, 3, :o3, 701823600
-          tz.transition 1992, 9, :o2, 717548400
-          tz.transition 1993, 3, :o3, 733273200
-          tz.transition 1993, 9, :o2, 748998000
-          tz.transition 1994, 3, :o3, 764722800
-          tz.transition 1994, 9, :o2, 780447600
-          tz.transition 1995, 3, :o3, 796172400
-          tz.transition 1995, 9, :o2, 811897200
-          tz.transition 1996, 3, :o3, 828226800
-          tz.transition 1996, 10, :o2, 846370800
-          tz.transition 1997, 3, :o3, 859676400
-          tz.transition 1997, 10, :o2, 877820400
-          tz.transition 1998, 3, :o3, 891126000
-          tz.transition 1998, 10, :o2, 909270000
-          tz.transition 1999, 3, :o3, 922575600
-          tz.transition 1999, 10, :o2, 941324400
-          tz.transition 2000, 3, :o3, 954025200
-          tz.transition 2000, 10, :o2, 972774000
-          tz.transition 2001, 3, :o3, 985474800
-          tz.transition 2001, 10, :o2, 1004223600
-          tz.transition 2002, 3, :o3, 1017529200
-          tz.transition 2002, 10, :o2, 1035673200
-          tz.transition 2003, 3, :o3, 1048978800
-          tz.transition 2003, 10, :o2, 1067122800
-          tz.transition 2004, 3, :o3, 1080428400
-          tz.transition 2004, 10, :o2, 1099177200
-          tz.transition 2005, 3, :o3, 1111878000
-          tz.transition 2005, 10, :o2, 1130626800
-          tz.transition 2006, 3, :o3, 1143327600
-          tz.transition 2006, 10, :o2, 1162076400
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Kiev.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Kiev.rb
deleted file mode 100644
index 513d3308be..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Kiev.rb
+++ /dev/null
@@ -1,168 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Kiev
-        include TimezoneDefinition
-        
-        timezone 'Europe/Kiev' do |tz|
-          tz.offset :o0, 7324, 0, :LMT
-          tz.offset :o1, 7324, 0, :KMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 10800, 0, :MSK
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 3600, 0, :CET
-          tz.offset :o6, 10800, 3600, :MSD
-          tz.offset :o7, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 52006652969, 21600
-          tz.transition 1924, 5, :o2, 52356400169, 21600
-          tz.transition 1930, 6, :o3, 29113781, 12
-          tz.transition 1941, 9, :o4, 19442059, 8
-          tz.transition 1942, 11, :o5, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o5, 58344037, 24
-          tz.transition 1943, 11, :o3, 58344827, 24
-          tz.transition 1981, 3, :o6, 354920400
-          tz.transition 1981, 9, :o3, 370728000
-          tz.transition 1982, 3, :o6, 386456400
-          tz.transition 1982, 9, :o3, 402264000
-          tz.transition 1983, 3, :o6, 417992400
-          tz.transition 1983, 9, :o3, 433800000
-          tz.transition 1984, 3, :o6, 449614800
-          tz.transition 1984, 9, :o3, 465346800
-          tz.transition 1985, 3, :o6, 481071600
-          tz.transition 1985, 9, :o3, 496796400
-          tz.transition 1986, 3, :o6, 512521200
-          tz.transition 1986, 9, :o3, 528246000
-          tz.transition 1987, 3, :o6, 543970800
-          tz.transition 1987, 9, :o3, 559695600
-          tz.transition 1988, 3, :o6, 575420400
-          tz.transition 1988, 9, :o3, 591145200
-          tz.transition 1989, 3, :o6, 606870000
-          tz.transition 1989, 9, :o3, 622594800
-          tz.transition 1990, 6, :o2, 646786800
-          tz.transition 1992, 3, :o7, 701820000
-          tz.transition 1992, 9, :o2, 717541200
-          tz.transition 1993, 3, :o7, 733269600
-          tz.transition 1993, 9, :o2, 748990800
-          tz.transition 1994, 3, :o7, 764719200
-          tz.transition 1994, 9, :o2, 780440400
-          tz.transition 1995, 3, :o7, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o7, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o7, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o7, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o7, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o7, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o7, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o7, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o7, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o7, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o7, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o7, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o7, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o7, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o7, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o7, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o7, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o7, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o7, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o7, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o7, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o7, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o7, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o7, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o7, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o7, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o7, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o7, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o7, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o7, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o7, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o7, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o7, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o7, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o7, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o7, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o7, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o7, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o7, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o7, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o7, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o7, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o7, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o7, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o7, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o7, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o7, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o7, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o7, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o7, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o7, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o7, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o7, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o7, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o7, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o7, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Lisbon.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Lisbon.rb
deleted file mode 100644
index 1c6d2a3d30..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Lisbon.rb
+++ /dev/null
@@ -1,268 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Lisbon
-        include TimezoneDefinition
-        
-        timezone 'Europe/Lisbon' do |tz|
-          tz.offset :o0, -2192, 0, :LMT
-          tz.offset :o1, 0, 0, :WET
-          tz.offset :o2, 0, 3600, :WEST
-          tz.offset :o3, 0, 7200, :WEMT
-          tz.offset :o4, 3600, 0, :CET
-          tz.offset :o5, 3600, 3600, :CEST
-          
-          tz.transition 1912, 1, :o1, 13064773637, 5400
-          tz.transition 1916, 6, :o2, 58104779, 24
-          tz.transition 1916, 11, :o1, 4842337, 2
-          tz.transition 1917, 2, :o2, 58110923, 24
-          tz.transition 1917, 10, :o1, 58116395, 24
-          tz.transition 1918, 3, :o2, 58119707, 24
-          tz.transition 1918, 10, :o1, 58125155, 24
-          tz.transition 1919, 2, :o2, 58128443, 24
-          tz.transition 1919, 10, :o1, 58133915, 24
-          tz.transition 1920, 2, :o2, 58137227, 24
-          tz.transition 1920, 10, :o1, 58142699, 24
-          tz.transition 1921, 2, :o2, 58145987, 24
-          tz.transition 1921, 10, :o1, 58151459, 24
-          tz.transition 1924, 4, :o2, 58173419, 24
-          tz.transition 1924, 10, :o1, 58177763, 24
-          tz.transition 1926, 4, :o2, 58190963, 24
-          tz.transition 1926, 10, :o1, 58194995, 24
-          tz.transition 1927, 4, :o2, 58199531, 24
-          tz.transition 1927, 10, :o1, 58203731, 24
-          tz.transition 1928, 4, :o2, 58208435, 24
-          tz.transition 1928, 10, :o1, 58212635, 24
-          tz.transition 1929, 4, :o2, 58217339, 24
-          tz.transition 1929, 10, :o1, 58221371, 24
-          tz.transition 1931, 4, :o2, 58234811, 24
-          tz.transition 1931, 10, :o1, 58238843, 24
-          tz.transition 1932, 4, :o2, 58243211, 24
-          tz.transition 1932, 10, :o1, 58247579, 24
-          tz.transition 1934, 4, :o2, 58260851, 24
-          tz.transition 1934, 10, :o1, 58265219, 24
-          tz.transition 1935, 3, :o2, 58269419, 24
-          tz.transition 1935, 10, :o1, 58273955, 24
-          tz.transition 1936, 4, :o2, 58278659, 24
-          tz.transition 1936, 10, :o1, 58282691, 24
-          tz.transition 1937, 4, :o2, 58287059, 24
-          tz.transition 1937, 10, :o1, 58291427, 24
-          tz.transition 1938, 3, :o2, 58295627, 24
-          tz.transition 1938, 10, :o1, 58300163, 24
-          tz.transition 1939, 4, :o2, 58304867, 24
-          tz.transition 1939, 11, :o1, 58310075, 24
-          tz.transition 1940, 2, :o2, 58312427, 24
-          tz.transition 1940, 10, :o1, 58317803, 24
-          tz.transition 1941, 4, :o2, 58322171, 24
-          tz.transition 1941, 10, :o1, 58326563, 24
-          tz.transition 1942, 3, :o2, 58330403, 24
-          tz.transition 1942, 4, :o3, 29165705, 12
-          tz.transition 1942, 8, :o2, 29167049, 12
-          tz.transition 1942, 10, :o1, 58335779, 24
-          tz.transition 1943, 3, :o2, 58339139, 24
-          tz.transition 1943, 4, :o3, 29169989, 12
-          tz.transition 1943, 8, :o2, 29171585, 12
-          tz.transition 1943, 10, :o1, 58344683, 24
-          tz.transition 1944, 3, :o2, 58347875, 24
-          tz.transition 1944, 4, :o3, 29174441, 12
-          tz.transition 1944, 8, :o2, 29175953, 12
-          tz.transition 1944, 10, :o1, 58353419, 24
-          tz.transition 1945, 3, :o2, 58356611, 24
-          tz.transition 1945, 4, :o3, 29178809, 12
-          tz.transition 1945, 8, :o2, 29180321, 12
-          tz.transition 1945, 10, :o1, 58362155, 24
-          tz.transition 1946, 4, :o2, 58366019, 24
-          tz.transition 1946, 10, :o1, 58370387, 24
-          tz.transition 1947, 4, :o2, 29187379, 12
-          tz.transition 1947, 10, :o1, 29189563, 12
-          tz.transition 1948, 4, :o2, 29191747, 12
-          tz.transition 1948, 10, :o1, 29193931, 12
-          tz.transition 1949, 4, :o2, 29196115, 12
-          tz.transition 1949, 10, :o1, 29198299, 12
-          tz.transition 1951, 4, :o2, 29204851, 12
-          tz.transition 1951, 10, :o1, 29207119, 12
-          tz.transition 1952, 4, :o2, 29209303, 12
-          tz.transition 1952, 10, :o1, 29211487, 12
-          tz.transition 1953, 4, :o2, 29213671, 12
-          tz.transition 1953, 10, :o1, 29215855, 12
-          tz.transition 1954, 4, :o2, 29218039, 12
-          tz.transition 1954, 10, :o1, 29220223, 12
-          tz.transition 1955, 4, :o2, 29222407, 12
-          tz.transition 1955, 10, :o1, 29224591, 12
-          tz.transition 1956, 4, :o2, 29226775, 12
-          tz.transition 1956, 10, :o1, 29229043, 12
-          tz.transition 1957, 4, :o2, 29231227, 12
-          tz.transition 1957, 10, :o1, 29233411, 12
-          tz.transition 1958, 4, :o2, 29235595, 12
-          tz.transition 1958, 10, :o1, 29237779, 12
-          tz.transition 1959, 4, :o2, 29239963, 12
-          tz.transition 1959, 10, :o1, 29242147, 12
-          tz.transition 1960, 4, :o2, 29244331, 12
-          tz.transition 1960, 10, :o1, 29246515, 12
-          tz.transition 1961, 4, :o2, 29248699, 12
-          tz.transition 1961, 10, :o1, 29250883, 12
-          tz.transition 1962, 4, :o2, 29253067, 12
-          tz.transition 1962, 10, :o1, 29255335, 12
-          tz.transition 1963, 4, :o2, 29257519, 12
-          tz.transition 1963, 10, :o1, 29259703, 12
-          tz.transition 1964, 4, :o2, 29261887, 12
-          tz.transition 1964, 10, :o1, 29264071, 12
-          tz.transition 1965, 4, :o2, 29266255, 12
-          tz.transition 1965, 10, :o1, 29268439, 12
-          tz.transition 1966, 4, :o4, 29270623, 12
-          tz.transition 1976, 9, :o1, 212544000
-          tz.transition 1977, 3, :o2, 228268800
-          tz.transition 1977, 9, :o1, 243993600
-          tz.transition 1978, 4, :o2, 260323200
-          tz.transition 1978, 10, :o1, 276048000
-          tz.transition 1979, 4, :o2, 291772800
-          tz.transition 1979, 9, :o1, 307501200
-          tz.transition 1980, 3, :o2, 323222400
-          tz.transition 1980, 9, :o1, 338950800
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417578400
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o4, 717555600
-          tz.transition 1993, 3, :o5, 733280400
-          tz.transition 1993, 9, :o4, 749005200
-          tz.transition 1994, 3, :o5, 764730000
-          tz.transition 1994, 9, :o4, 780454800
-          tz.transition 1995, 3, :o5, 796179600
-          tz.transition 1995, 9, :o4, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Ljubljana.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Ljubljana.rb
deleted file mode 100644
index a9828e6ef8..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Ljubljana.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Ljubljana
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Ljubljana', 'Europe/Belgrade'
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/London.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/London.rb
deleted file mode 100644
index 64ce41e900..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/London.rb
+++ /dev/null
@@ -1,288 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module London
-        include TimezoneDefinition
-        
-        timezone 'Europe/London' do |tz|
-          tz.offset :o0, -75, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          tz.offset :o2, 0, 3600, :BST
-          tz.offset :o3, 0, 7200, :BDST
-          tz.offset :o4, 3600, 0, :BST
-          
-          tz.transition 1847, 12, :o1, 2760187969, 1152
-          tz.transition 1916, 5, :o2, 29052055, 12
-          tz.transition 1916, 10, :o1, 29053651, 12
-          tz.transition 1917, 4, :o2, 29055919, 12
-          tz.transition 1917, 9, :o1, 29057863, 12
-          tz.transition 1918, 3, :o2, 29060119, 12
-          tz.transition 1918, 9, :o1, 29062399, 12
-          tz.transition 1919, 3, :o2, 29064571, 12
-          tz.transition 1919, 9, :o1, 29066767, 12
-          tz.transition 1920, 3, :o2, 29068939, 12
-          tz.transition 1920, 10, :o1, 29071471, 12
-          tz.transition 1921, 4, :o2, 29073391, 12
-          tz.transition 1921, 10, :o1, 29075587, 12
-          tz.transition 1922, 3, :o2, 29077675, 12
-          tz.transition 1922, 10, :o1, 29080027, 12
-          tz.transition 1923, 4, :o2, 29082379, 12
-          tz.transition 1923, 9, :o1, 29084143, 12
-          tz.transition 1924, 4, :o2, 29086663, 12
-          tz.transition 1924, 9, :o1, 29088595, 12
-          tz.transition 1925, 4, :o2, 29091115, 12
-          tz.transition 1925, 10, :o1, 29093131, 12
-          tz.transition 1926, 4, :o2, 29095483, 12
-          tz.transition 1926, 10, :o1, 29097499, 12
-          tz.transition 1927, 4, :o2, 29099767, 12
-          tz.transition 1927, 10, :o1, 29101867, 12
-          tz.transition 1928, 4, :o2, 29104303, 12
-          tz.transition 1928, 10, :o1, 29106319, 12
-          tz.transition 1929, 4, :o2, 29108671, 12
-          tz.transition 1929, 10, :o1, 29110687, 12
-          tz.transition 1930, 4, :o2, 29112955, 12
-          tz.transition 1930, 10, :o1, 29115055, 12
-          tz.transition 1931, 4, :o2, 29117407, 12
-          tz.transition 1931, 10, :o1, 29119423, 12
-          tz.transition 1932, 4, :o2, 29121775, 12
-          tz.transition 1932, 10, :o1, 29123791, 12
-          tz.transition 1933, 4, :o2, 29126059, 12
-          tz.transition 1933, 10, :o1, 29128243, 12
-          tz.transition 1934, 4, :o2, 29130595, 12
-          tz.transition 1934, 10, :o1, 29132611, 12
-          tz.transition 1935, 4, :o2, 29134879, 12
-          tz.transition 1935, 10, :o1, 29136979, 12
-          tz.transition 1936, 4, :o2, 29139331, 12
-          tz.transition 1936, 10, :o1, 29141347, 12
-          tz.transition 1937, 4, :o2, 29143699, 12
-          tz.transition 1937, 10, :o1, 29145715, 12
-          tz.transition 1938, 4, :o2, 29147983, 12
-          tz.transition 1938, 10, :o1, 29150083, 12
-          tz.transition 1939, 4, :o2, 29152435, 12
-          tz.transition 1939, 11, :o1, 29155039, 12
-          tz.transition 1940, 2, :o2, 29156215, 12
-          tz.transition 1941, 5, :o3, 58322845, 24
-          tz.transition 1941, 8, :o2, 58325197, 24
-          tz.transition 1942, 4, :o3, 58330909, 24
-          tz.transition 1942, 8, :o2, 58333933, 24
-          tz.transition 1943, 4, :o3, 58339645, 24
-          tz.transition 1943, 8, :o2, 58342837, 24
-          tz.transition 1944, 4, :o3, 58348381, 24
-          tz.transition 1944, 9, :o2, 58352413, 24
-          tz.transition 1945, 4, :o3, 58357141, 24
-          tz.transition 1945, 7, :o2, 58359637, 24
-          tz.transition 1945, 10, :o1, 29180827, 12
-          tz.transition 1946, 4, :o2, 29183095, 12
-          tz.transition 1946, 10, :o1, 29185195, 12
-          tz.transition 1947, 3, :o2, 29187127, 12
-          tz.transition 1947, 4, :o3, 58374925, 24
-          tz.transition 1947, 8, :o2, 58377781, 24
-          tz.transition 1947, 11, :o1, 29189899, 12
-          tz.transition 1948, 3, :o2, 29191495, 12
-          tz.transition 1948, 10, :o1, 29194267, 12
-          tz.transition 1949, 4, :o2, 29196115, 12
-          tz.transition 1949, 10, :o1, 29198635, 12
-          tz.transition 1950, 4, :o2, 29200651, 12
-          tz.transition 1950, 10, :o1, 29202919, 12
-          tz.transition 1951, 4, :o2, 29205019, 12
-          tz.transition 1951, 10, :o1, 29207287, 12
-          tz.transition 1952, 4, :o2, 29209471, 12
-          tz.transition 1952, 10, :o1, 29211739, 12
-          tz.transition 1953, 4, :o2, 29213839, 12
-          tz.transition 1953, 10, :o1, 29215855, 12
-          tz.transition 1954, 4, :o2, 29218123, 12
-          tz.transition 1954, 10, :o1, 29220223, 12
-          tz.transition 1955, 4, :o2, 29222575, 12
-          tz.transition 1955, 10, :o1, 29224591, 12
-          tz.transition 1956, 4, :o2, 29227027, 12
-          tz.transition 1956, 10, :o1, 29229043, 12
-          tz.transition 1957, 4, :o2, 29231311, 12
-          tz.transition 1957, 10, :o1, 29233411, 12
-          tz.transition 1958, 4, :o2, 29235763, 12
-          tz.transition 1958, 10, :o1, 29237779, 12
-          tz.transition 1959, 4, :o2, 29240131, 12
-          tz.transition 1959, 10, :o1, 29242147, 12
-          tz.transition 1960, 4, :o2, 29244415, 12
-          tz.transition 1960, 10, :o1, 29246515, 12
-          tz.transition 1961, 3, :o2, 29248615, 12
-          tz.transition 1961, 10, :o1, 29251219, 12
-          tz.transition 1962, 3, :o2, 29252983, 12
-          tz.transition 1962, 10, :o1, 29255587, 12
-          tz.transition 1963, 3, :o2, 29257435, 12
-          tz.transition 1963, 10, :o1, 29259955, 12
-          tz.transition 1964, 3, :o2, 29261719, 12
-          tz.transition 1964, 10, :o1, 29264323, 12
-          tz.transition 1965, 3, :o2, 29266087, 12
-          tz.transition 1965, 10, :o1, 29268691, 12
-          tz.transition 1966, 3, :o2, 29270455, 12
-          tz.transition 1966, 10, :o1, 29273059, 12
-          tz.transition 1967, 3, :o2, 29274823, 12
-          tz.transition 1967, 10, :o1, 29277511, 12
-          tz.transition 1968, 2, :o2, 29278855, 12
-          tz.transition 1968, 10, :o4, 58563755, 24
-          tz.transition 1971, 10, :o1, 57722400
-          tz.transition 1972, 3, :o2, 69818400
-          tz.transition 1972, 10, :o1, 89172000
-          tz.transition 1973, 3, :o2, 101268000
-          tz.transition 1973, 10, :o1, 120621600
-          tz.transition 1974, 3, :o2, 132717600
-          tz.transition 1974, 10, :o1, 152071200
-          tz.transition 1975, 3, :o2, 164167200
-          tz.transition 1975, 10, :o1, 183520800
-          tz.transition 1976, 3, :o2, 196221600
-          tz.transition 1976, 10, :o1, 214970400
-          tz.transition 1977, 3, :o2, 227671200
-          tz.transition 1977, 10, :o1, 246420000
-          tz.transition 1978, 3, :o2, 259120800
-          tz.transition 1978, 10, :o1, 278474400
-          tz.transition 1979, 3, :o2, 290570400
-          tz.transition 1979, 10, :o1, 309924000
-          tz.transition 1980, 3, :o2, 322020000
-          tz.transition 1980, 10, :o1, 341373600
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 10, :o1, 372819600
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 10, :o1, 404269200
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 10, :o1, 435718800
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 10, :o1, 467773200
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 10, :o1, 499222800
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 10, :o1, 530672400
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 10, :o1, 562122000
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 10, :o1, 593571600
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 10, :o1, 625626000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 10, :o1, 657075600
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 10, :o1, 688525200
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 10, :o1, 719974800
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 10, :o1, 751424400
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 10, :o1, 782874000
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 10, :o1, 814323600
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Madrid.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Madrid.rb
deleted file mode 100644
index 1fb568239a..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Madrid.rb
+++ /dev/null
@@ -1,211 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Madrid
-        include TimezoneDefinition
-        
-        timezone 'Europe/Madrid' do |tz|
-          tz.offset :o0, -884, 0, :LMT
-          tz.offset :o1, 0, 0, :WET
-          tz.offset :o2, 0, 3600, :WEST
-          tz.offset :o3, 0, 7200, :WEMT
-          tz.offset :o4, 3600, 0, :CET
-          tz.offset :o5, 3600, 3600, :CEST
-          
-          tz.transition 1901, 1, :o1, 52172327021, 21600
-          tz.transition 1917, 5, :o2, 58112507, 24
-          tz.transition 1917, 10, :o1, 58116203, 24
-          tz.transition 1918, 4, :o2, 58120787, 24
-          tz.transition 1918, 10, :o1, 58124963, 24
-          tz.transition 1919, 4, :o2, 58129307, 24
-          tz.transition 1919, 10, :o1, 58133723, 24
-          tz.transition 1924, 4, :o2, 58173419, 24
-          tz.transition 1924, 10, :o1, 58177523, 24
-          tz.transition 1926, 4, :o2, 58190963, 24
-          tz.transition 1926, 10, :o1, 58194995, 24
-          tz.transition 1927, 4, :o2, 58199531, 24
-          tz.transition 1927, 10, :o1, 58203731, 24
-          tz.transition 1928, 4, :o2, 58208435, 24
-          tz.transition 1928, 10, :o1, 58212635, 24
-          tz.transition 1929, 4, :o2, 58217339, 24
-          tz.transition 1929, 10, :o1, 58221371, 24
-          tz.transition 1937, 5, :o2, 58288235, 24
-          tz.transition 1937, 10, :o1, 58291427, 24
-          tz.transition 1938, 3, :o2, 58295531, 24
-          tz.transition 1938, 10, :o1, 58300163, 24
-          tz.transition 1939, 4, :o2, 58304867, 24
-          tz.transition 1939, 10, :o1, 58309067, 24
-          tz.transition 1940, 3, :o2, 58312931, 24
-          tz.transition 1942, 5, :o3, 29165789, 12
-          tz.transition 1942, 9, :o2, 29167253, 12
-          tz.transition 1943, 4, :o3, 29169989, 12
-          tz.transition 1943, 10, :o2, 29172017, 12
-          tz.transition 1944, 4, :o3, 29174357, 12
-          tz.transition 1944, 10, :o2, 29176493, 12
-          tz.transition 1945, 4, :o3, 29178725, 12
-          tz.transition 1945, 9, :o2, 58361483, 24
-          tz.transition 1946, 4, :o3, 29183093, 12
-          tz.transition 1946, 9, :o4, 29185121, 12
-          tz.transition 1949, 4, :o5, 29196449, 12
-          tz.transition 1949, 9, :o4, 58396547, 24
-          tz.transition 1974, 4, :o5, 135122400
-          tz.transition 1974, 10, :o4, 150246000
-          tz.transition 1975, 4, :o5, 167176800
-          tz.transition 1975, 10, :o4, 181695600
-          tz.transition 1976, 3, :o5, 196812000
-          tz.transition 1976, 9, :o4, 212540400
-          tz.transition 1977, 4, :o5, 228866400
-          tz.transition 1977, 9, :o4, 243990000
-          tz.transition 1978, 4, :o5, 260402400
-          tz.transition 1978, 9, :o4, 276044400
-          tz.transition 1979, 4, :o5, 291776400
-          tz.transition 1979, 9, :o4, 307501200
-          tz.transition 1980, 4, :o5, 323830800
-          tz.transition 1980, 9, :o4, 338950800
-          tz.transition 1981, 3, :o5, 354675600
-          tz.transition 1981, 9, :o4, 370400400
-          tz.transition 1982, 3, :o5, 386125200
-          tz.transition 1982, 9, :o4, 401850000
-          tz.transition 1983, 3, :o5, 417574800
-          tz.transition 1983, 9, :o4, 433299600
-          tz.transition 1984, 3, :o5, 449024400
-          tz.transition 1984, 9, :o4, 465354000
-          tz.transition 1985, 3, :o5, 481078800
-          tz.transition 1985, 9, :o4, 496803600
-          tz.transition 1986, 3, :o5, 512528400
-          tz.transition 1986, 9, :o4, 528253200
-          tz.transition 1987, 3, :o5, 543978000
-          tz.transition 1987, 9, :o4, 559702800
-          tz.transition 1988, 3, :o5, 575427600
-          tz.transition 1988, 9, :o4, 591152400
-          tz.transition 1989, 3, :o5, 606877200
-          tz.transition 1989, 9, :o4, 622602000
-          tz.transition 1990, 3, :o5, 638326800
-          tz.transition 1990, 9, :o4, 654656400
-          tz.transition 1991, 3, :o5, 670381200
-          tz.transition 1991, 9, :o4, 686106000
-          tz.transition 1992, 3, :o5, 701830800
-          tz.transition 1992, 9, :o4, 717555600
-          tz.transition 1993, 3, :o5, 733280400
-          tz.transition 1993, 9, :o4, 749005200
-          tz.transition 1994, 3, :o5, 764730000
-          tz.transition 1994, 9, :o4, 780454800
-          tz.transition 1995, 3, :o5, 796179600
-          tz.transition 1995, 9, :o4, 811904400
-          tz.transition 1996, 3, :o5, 828234000
-          tz.transition 1996, 10, :o4, 846378000
-          tz.transition 1997, 3, :o5, 859683600
-          tz.transition 1997, 10, :o4, 877827600
-          tz.transition 1998, 3, :o5, 891133200
-          tz.transition 1998, 10, :o4, 909277200
-          tz.transition 1999, 3, :o5, 922582800
-          tz.transition 1999, 10, :o4, 941331600
-          tz.transition 2000, 3, :o5, 954032400
-          tz.transition 2000, 10, :o4, 972781200
-          tz.transition 2001, 3, :o5, 985482000
-          tz.transition 2001, 10, :o4, 1004230800
-          tz.transition 2002, 3, :o5, 1017536400
-          tz.transition 2002, 10, :o4, 1035680400
-          tz.transition 2003, 3, :o5, 1048986000
-          tz.transition 2003, 10, :o4, 1067130000
-          tz.transition 2004, 3, :o5, 1080435600
-          tz.transition 2004, 10, :o4, 1099184400
-          tz.transition 2005, 3, :o5, 1111885200
-          tz.transition 2005, 10, :o4, 1130634000
-          tz.transition 2006, 3, :o5, 1143334800
-          tz.transition 2006, 10, :o4, 1162083600
-          tz.transition 2007, 3, :o5, 1174784400
-          tz.transition 2007, 10, :o4, 1193533200
-          tz.transition 2008, 3, :o5, 1206838800
-          tz.transition 2008, 10, :o4, 1224982800
-          tz.transition 2009, 3, :o5, 1238288400
-          tz.transition 2009, 10, :o4, 1256432400
-          tz.transition 2010, 3, :o5, 1269738000
-          tz.transition 2010, 10, :o4, 1288486800
-          tz.transition 2011, 3, :o5, 1301187600
-          tz.transition 2011, 10, :o4, 1319936400
-          tz.transition 2012, 3, :o5, 1332637200
-          tz.transition 2012, 10, :o4, 1351386000
-          tz.transition 2013, 3, :o5, 1364691600
-          tz.transition 2013, 10, :o4, 1382835600
-          tz.transition 2014, 3, :o5, 1396141200
-          tz.transition 2014, 10, :o4, 1414285200
-          tz.transition 2015, 3, :o5, 1427590800
-          tz.transition 2015, 10, :o4, 1445734800
-          tz.transition 2016, 3, :o5, 1459040400
-          tz.transition 2016, 10, :o4, 1477789200
-          tz.transition 2017, 3, :o5, 1490490000
-          tz.transition 2017, 10, :o4, 1509238800
-          tz.transition 2018, 3, :o5, 1521939600
-          tz.transition 2018, 10, :o4, 1540688400
-          tz.transition 2019, 3, :o5, 1553994000
-          tz.transition 2019, 10, :o4, 1572138000
-          tz.transition 2020, 3, :o5, 1585443600
-          tz.transition 2020, 10, :o4, 1603587600
-          tz.transition 2021, 3, :o5, 1616893200
-          tz.transition 2021, 10, :o4, 1635642000
-          tz.transition 2022, 3, :o5, 1648342800
-          tz.transition 2022, 10, :o4, 1667091600
-          tz.transition 2023, 3, :o5, 1679792400
-          tz.transition 2023, 10, :o4, 1698541200
-          tz.transition 2024, 3, :o5, 1711846800
-          tz.transition 2024, 10, :o4, 1729990800
-          tz.transition 2025, 3, :o5, 1743296400
-          tz.transition 2025, 10, :o4, 1761440400
-          tz.transition 2026, 3, :o5, 1774746000
-          tz.transition 2026, 10, :o4, 1792890000
-          tz.transition 2027, 3, :o5, 1806195600
-          tz.transition 2027, 10, :o4, 1824944400
-          tz.transition 2028, 3, :o5, 1837645200
-          tz.transition 2028, 10, :o4, 1856394000
-          tz.transition 2029, 3, :o5, 1869094800
-          tz.transition 2029, 10, :o4, 1887843600
-          tz.transition 2030, 3, :o5, 1901149200
-          tz.transition 2030, 10, :o4, 1919293200
-          tz.transition 2031, 3, :o5, 1932598800
-          tz.transition 2031, 10, :o4, 1950742800
-          tz.transition 2032, 3, :o5, 1964048400
-          tz.transition 2032, 10, :o4, 1982797200
-          tz.transition 2033, 3, :o5, 1995498000
-          tz.transition 2033, 10, :o4, 2014246800
-          tz.transition 2034, 3, :o5, 2026947600
-          tz.transition 2034, 10, :o4, 2045696400
-          tz.transition 2035, 3, :o5, 2058397200
-          tz.transition 2035, 10, :o4, 2077146000
-          tz.transition 2036, 3, :o5, 2090451600
-          tz.transition 2036, 10, :o4, 2108595600
-          tz.transition 2037, 3, :o5, 2121901200
-          tz.transition 2037, 10, :o4, 2140045200
-          tz.transition 2038, 3, :o5, 59172253, 24
-          tz.transition 2038, 10, :o4, 59177461, 24
-          tz.transition 2039, 3, :o5, 59180989, 24
-          tz.transition 2039, 10, :o4, 59186197, 24
-          tz.transition 2040, 3, :o5, 59189725, 24
-          tz.transition 2040, 10, :o4, 59194933, 24
-          tz.transition 2041, 3, :o5, 59198629, 24
-          tz.transition 2041, 10, :o4, 59203669, 24
-          tz.transition 2042, 3, :o5, 59207365, 24
-          tz.transition 2042, 10, :o4, 59212405, 24
-          tz.transition 2043, 3, :o5, 59216101, 24
-          tz.transition 2043, 10, :o4, 59221141, 24
-          tz.transition 2044, 3, :o5, 59224837, 24
-          tz.transition 2044, 10, :o4, 59230045, 24
-          tz.transition 2045, 3, :o5, 59233573, 24
-          tz.transition 2045, 10, :o4, 59238781, 24
-          tz.transition 2046, 3, :o5, 59242309, 24
-          tz.transition 2046, 10, :o4, 59247517, 24
-          tz.transition 2047, 3, :o5, 59251213, 24
-          tz.transition 2047, 10, :o4, 59256253, 24
-          tz.transition 2048, 3, :o5, 59259949, 24
-          tz.transition 2048, 10, :o4, 59264989, 24
-          tz.transition 2049, 3, :o5, 59268685, 24
-          tz.transition 2049, 10, :o4, 59273893, 24
-          tz.transition 2050, 3, :o5, 59277421, 24
-          tz.transition 2050, 10, :o4, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Minsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Minsk.rb
deleted file mode 100644
index fa15816cc8..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Minsk.rb
+++ /dev/null
@@ -1,170 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Minsk
-        include TimezoneDefinition
-        
-        timezone 'Europe/Minsk' do |tz|
-          tz.offset :o0, 6616, 0, :LMT
-          tz.offset :o1, 6600, 0, :MMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 10800, 0, :MSK
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 3600, 0, :CET
-          tz.offset :o6, 10800, 3600, :MSD
-          tz.offset :o7, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 26003326573, 10800
-          tz.transition 1924, 5, :o2, 349042669, 144
-          tz.transition 1930, 6, :o3, 29113781, 12
-          tz.transition 1941, 6, :o4, 19441387, 8
-          tz.transition 1942, 11, :o5, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o5, 58344037, 24
-          tz.transition 1944, 4, :o4, 58348405, 24
-          tz.transition 1944, 7, :o3, 29175293, 12
-          tz.transition 1981, 3, :o6, 354920400
-          tz.transition 1981, 9, :o3, 370728000
-          tz.transition 1982, 3, :o6, 386456400
-          tz.transition 1982, 9, :o3, 402264000
-          tz.transition 1983, 3, :o6, 417992400
-          tz.transition 1983, 9, :o3, 433800000
-          tz.transition 1984, 3, :o6, 449614800
-          tz.transition 1984, 9, :o3, 465346800
-          tz.transition 1985, 3, :o6, 481071600
-          tz.transition 1985, 9, :o3, 496796400
-          tz.transition 1986, 3, :o6, 512521200
-          tz.transition 1986, 9, :o3, 528246000
-          tz.transition 1987, 3, :o6, 543970800
-          tz.transition 1987, 9, :o3, 559695600
-          tz.transition 1988, 3, :o6, 575420400
-          tz.transition 1988, 9, :o3, 591145200
-          tz.transition 1989, 3, :o6, 606870000
-          tz.transition 1989, 9, :o3, 622594800
-          tz.transition 1991, 3, :o7, 670374000
-          tz.transition 1991, 9, :o2, 686102400
-          tz.transition 1992, 3, :o7, 701820000
-          tz.transition 1992, 9, :o2, 717544800
-          tz.transition 1993, 3, :o7, 733276800
-          tz.transition 1993, 9, :o2, 749001600
-          tz.transition 1994, 3, :o7, 764726400
-          tz.transition 1994, 9, :o2, 780451200
-          tz.transition 1995, 3, :o7, 796176000
-          tz.transition 1995, 9, :o2, 811900800
-          tz.transition 1996, 3, :o7, 828230400
-          tz.transition 1996, 10, :o2, 846374400
-          tz.transition 1997, 3, :o7, 859680000
-          tz.transition 1997, 10, :o2, 877824000
-          tz.transition 1998, 3, :o7, 891129600
-          tz.transition 1998, 10, :o2, 909273600
-          tz.transition 1999, 3, :o7, 922579200
-          tz.transition 1999, 10, :o2, 941328000
-          tz.transition 2000, 3, :o7, 954028800
-          tz.transition 2000, 10, :o2, 972777600
-          tz.transition 2001, 3, :o7, 985478400
-          tz.transition 2001, 10, :o2, 1004227200
-          tz.transition 2002, 3, :o7, 1017532800
-          tz.transition 2002, 10, :o2, 1035676800
-          tz.transition 2003, 3, :o7, 1048982400
-          tz.transition 2003, 10, :o2, 1067126400
-          tz.transition 2004, 3, :o7, 1080432000
-          tz.transition 2004, 10, :o2, 1099180800
-          tz.transition 2005, 3, :o7, 1111881600
-          tz.transition 2005, 10, :o2, 1130630400
-          tz.transition 2006, 3, :o7, 1143331200
-          tz.transition 2006, 10, :o2, 1162080000
-          tz.transition 2007, 3, :o7, 1174780800
-          tz.transition 2007, 10, :o2, 1193529600
-          tz.transition 2008, 3, :o7, 1206835200
-          tz.transition 2008, 10, :o2, 1224979200
-          tz.transition 2009, 3, :o7, 1238284800
-          tz.transition 2009, 10, :o2, 1256428800
-          tz.transition 2010, 3, :o7, 1269734400
-          tz.transition 2010, 10, :o2, 1288483200
-          tz.transition 2011, 3, :o7, 1301184000
-          tz.transition 2011, 10, :o2, 1319932800
-          tz.transition 2012, 3, :o7, 1332633600
-          tz.transition 2012, 10, :o2, 1351382400
-          tz.transition 2013, 3, :o7, 1364688000
-          tz.transition 2013, 10, :o2, 1382832000
-          tz.transition 2014, 3, :o7, 1396137600
-          tz.transition 2014, 10, :o2, 1414281600
-          tz.transition 2015, 3, :o7, 1427587200
-          tz.transition 2015, 10, :o2, 1445731200
-          tz.transition 2016, 3, :o7, 1459036800
-          tz.transition 2016, 10, :o2, 1477785600
-          tz.transition 2017, 3, :o7, 1490486400
-          tz.transition 2017, 10, :o2, 1509235200
-          tz.transition 2018, 3, :o7, 1521936000
-          tz.transition 2018, 10, :o2, 1540684800
-          tz.transition 2019, 3, :o7, 1553990400
-          tz.transition 2019, 10, :o2, 1572134400
-          tz.transition 2020, 3, :o7, 1585440000
-          tz.transition 2020, 10, :o2, 1603584000
-          tz.transition 2021, 3, :o7, 1616889600
-          tz.transition 2021, 10, :o2, 1635638400
-          tz.transition 2022, 3, :o7, 1648339200
-          tz.transition 2022, 10, :o2, 1667088000
-          tz.transition 2023, 3, :o7, 1679788800
-          tz.transition 2023, 10, :o2, 1698537600
-          tz.transition 2024, 3, :o7, 1711843200
-          tz.transition 2024, 10, :o2, 1729987200
-          tz.transition 2025, 3, :o7, 1743292800
-          tz.transition 2025, 10, :o2, 1761436800
-          tz.transition 2026, 3, :o7, 1774742400
-          tz.transition 2026, 10, :o2, 1792886400
-          tz.transition 2027, 3, :o7, 1806192000
-          tz.transition 2027, 10, :o2, 1824940800
-          tz.transition 2028, 3, :o7, 1837641600
-          tz.transition 2028, 10, :o2, 1856390400
-          tz.transition 2029, 3, :o7, 1869091200
-          tz.transition 2029, 10, :o2, 1887840000
-          tz.transition 2030, 3, :o7, 1901145600
-          tz.transition 2030, 10, :o2, 1919289600
-          tz.transition 2031, 3, :o7, 1932595200
-          tz.transition 2031, 10, :o2, 1950739200
-          tz.transition 2032, 3, :o7, 1964044800
-          tz.transition 2032, 10, :o2, 1982793600
-          tz.transition 2033, 3, :o7, 1995494400
-          tz.transition 2033, 10, :o2, 2014243200
-          tz.transition 2034, 3, :o7, 2026944000
-          tz.transition 2034, 10, :o2, 2045692800
-          tz.transition 2035, 3, :o7, 2058393600
-          tz.transition 2035, 10, :o2, 2077142400
-          tz.transition 2036, 3, :o7, 2090448000
-          tz.transition 2036, 10, :o2, 2108592000
-          tz.transition 2037, 3, :o7, 2121897600
-          tz.transition 2037, 10, :o2, 2140041600
-          tz.transition 2038, 3, :o7, 4931021, 2
-          tz.transition 2038, 10, :o2, 4931455, 2
-          tz.transition 2039, 3, :o7, 4931749, 2
-          tz.transition 2039, 10, :o2, 4932183, 2
-          tz.transition 2040, 3, :o7, 4932477, 2
-          tz.transition 2040, 10, :o2, 4932911, 2
-          tz.transition 2041, 3, :o7, 4933219, 2
-          tz.transition 2041, 10, :o2, 4933639, 2
-          tz.transition 2042, 3, :o7, 4933947, 2
-          tz.transition 2042, 10, :o2, 4934367, 2
-          tz.transition 2043, 3, :o7, 4934675, 2
-          tz.transition 2043, 10, :o2, 4935095, 2
-          tz.transition 2044, 3, :o7, 4935403, 2
-          tz.transition 2044, 10, :o2, 4935837, 2
-          tz.transition 2045, 3, :o7, 4936131, 2
-          tz.transition 2045, 10, :o2, 4936565, 2
-          tz.transition 2046, 3, :o7, 4936859, 2
-          tz.transition 2046, 10, :o2, 4937293, 2
-          tz.transition 2047, 3, :o7, 4937601, 2
-          tz.transition 2047, 10, :o2, 4938021, 2
-          tz.transition 2048, 3, :o7, 4938329, 2
-          tz.transition 2048, 10, :o2, 4938749, 2
-          tz.transition 2049, 3, :o7, 4939057, 2
-          tz.transition 2049, 10, :o2, 4939491, 2
-          tz.transition 2050, 3, :o7, 4939785, 2
-          tz.transition 2050, 10, :o2, 4940219, 2
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Moscow.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Moscow.rb
deleted file mode 100644
index ef269b675b..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Moscow.rb
+++ /dev/null
@@ -1,181 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Moscow
-        include TimezoneDefinition
-        
-        timezone 'Europe/Moscow' do |tz|
-          tz.offset :o0, 9020, 0, :LMT
-          tz.offset :o1, 9000, 0, :MMT
-          tz.offset :o2, 9048, 0, :MMT
-          tz.offset :o3, 9048, 3600, :MST
-          tz.offset :o4, 9048, 7200, :MDST
-          tz.offset :o5, 10800, 3600, :MSD
-          tz.offset :o6, 10800, 0, :MSK
-          tz.offset :o7, 10800, 7200, :MSD
-          tz.offset :o8, 7200, 0, :EET
-          tz.offset :o9, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 10401330509, 4320
-          tz.transition 1916, 7, :o2, 116210275, 48
-          tz.transition 1917, 7, :o3, 8717080873, 3600
-          tz.transition 1917, 12, :o2, 8717725273, 3600
-          tz.transition 1918, 5, :o4, 8718283123, 3600
-          tz.transition 1918, 9, :o3, 8718668473, 3600
-          tz.transition 1919, 5, :o4, 8719597123, 3600
-          tz.transition 1919, 6, :o5, 8719705423, 3600
-          tz.transition 1919, 8, :o6, 7266559, 3
-          tz.transition 1921, 2, :o5, 7268206, 3
-          tz.transition 1921, 3, :o7, 58146463, 24
-          tz.transition 1921, 8, :o5, 58150399, 24
-          tz.transition 1921, 9, :o6, 7268890, 3
-          tz.transition 1922, 9, :o8, 19386627, 8
-          tz.transition 1930, 6, :o6, 29113781, 12
-          tz.transition 1981, 3, :o5, 354920400
-          tz.transition 1981, 9, :o6, 370728000
-          tz.transition 1982, 3, :o5, 386456400
-          tz.transition 1982, 9, :o6, 402264000
-          tz.transition 1983, 3, :o5, 417992400
-          tz.transition 1983, 9, :o6, 433800000
-          tz.transition 1984, 3, :o5, 449614800
-          tz.transition 1984, 9, :o6, 465346800
-          tz.transition 1985, 3, :o5, 481071600
-          tz.transition 1985, 9, :o6, 496796400
-          tz.transition 1986, 3, :o5, 512521200
-          tz.transition 1986, 9, :o6, 528246000
-          tz.transition 1987, 3, :o5, 543970800
-          tz.transition 1987, 9, :o6, 559695600
-          tz.transition 1988, 3, :o5, 575420400
-          tz.transition 1988, 9, :o6, 591145200
-          tz.transition 1989, 3, :o5, 606870000
-          tz.transition 1989, 9, :o6, 622594800
-          tz.transition 1990, 3, :o5, 638319600
-          tz.transition 1990, 9, :o6, 654649200
-          tz.transition 1991, 3, :o9, 670374000
-          tz.transition 1991, 9, :o8, 686102400
-          tz.transition 1992, 1, :o6, 695779200
-          tz.transition 1992, 3, :o5, 701812800
-          tz.transition 1992, 9, :o6, 717534000
-          tz.transition 1993, 3, :o5, 733273200
-          tz.transition 1993, 9, :o6, 748998000
-          tz.transition 1994, 3, :o5, 764722800
-          tz.transition 1994, 9, :o6, 780447600
-          tz.transition 1995, 3, :o5, 796172400
-          tz.transition 1995, 9, :o6, 811897200
-          tz.transition 1996, 3, :o5, 828226800
-          tz.transition 1996, 10, :o6, 846370800
-          tz.transition 1997, 3, :o5, 859676400
-          tz.transition 1997, 10, :o6, 877820400
-          tz.transition 1998, 3, :o5, 891126000
-          tz.transition 1998, 10, :o6, 909270000
-          tz.transition 1999, 3, :o5, 922575600
-          tz.transition 1999, 10, :o6, 941324400
-          tz.transition 2000, 3, :o5, 954025200
-          tz.transition 2000, 10, :o6, 972774000
-          tz.transition 2001, 3, :o5, 985474800
-          tz.transition 2001, 10, :o6, 1004223600
-          tz.transition 2002, 3, :o5, 1017529200
-          tz.transition 2002, 10, :o6, 1035673200
-          tz.transition 2003, 3, :o5, 1048978800
-          tz.transition 2003, 10, :o6, 1067122800
-          tz.transition 2004, 3, :o5, 1080428400
-          tz.transition 2004, 10, :o6, 1099177200
-          tz.transition 2005, 3, :o5, 1111878000
-          tz.transition 2005, 10, :o6, 1130626800
-          tz.transition 2006, 3, :o5, 1143327600
-          tz.transition 2006, 10, :o6, 1162076400
-          tz.transition 2007, 3, :o5, 1174777200
-          tz.transition 2007, 10, :o6, 1193526000
-          tz.transition 2008, 3, :o5, 1206831600
-          tz.transition 2008, 10, :o6, 1224975600
-          tz.transition 2009, 3, :o5, 1238281200
-          tz.transition 2009, 10, :o6, 1256425200
-          tz.transition 2010, 3, :o5, 1269730800
-          tz.transition 2010, 10, :o6, 1288479600
-          tz.transition 2011, 3, :o5, 1301180400
-          tz.transition 2011, 10, :o6, 1319929200
-          tz.transition 2012, 3, :o5, 1332630000
-          tz.transition 2012, 10, :o6, 1351378800
-          tz.transition 2013, 3, :o5, 1364684400
-          tz.transition 2013, 10, :o6, 1382828400
-          tz.transition 2014, 3, :o5, 1396134000
-          tz.transition 2014, 10, :o6, 1414278000
-          tz.transition 2015, 3, :o5, 1427583600
-          tz.transition 2015, 10, :o6, 1445727600
-          tz.transition 2016, 3, :o5, 1459033200
-          tz.transition 2016, 10, :o6, 1477782000
-          tz.transition 2017, 3, :o5, 1490482800
-          tz.transition 2017, 10, :o6, 1509231600
-          tz.transition 2018, 3, :o5, 1521932400
-          tz.transition 2018, 10, :o6, 1540681200
-          tz.transition 2019, 3, :o5, 1553986800
-          tz.transition 2019, 10, :o6, 1572130800
-          tz.transition 2020, 3, :o5, 1585436400
-          tz.transition 2020, 10, :o6, 1603580400
-          tz.transition 2021, 3, :o5, 1616886000
-          tz.transition 2021, 10, :o6, 1635634800
-          tz.transition 2022, 3, :o5, 1648335600
-          tz.transition 2022, 10, :o6, 1667084400
-          tz.transition 2023, 3, :o5, 1679785200
-          tz.transition 2023, 10, :o6, 1698534000
-          tz.transition 2024, 3, :o5, 1711839600
-          tz.transition 2024, 10, :o6, 1729983600
-          tz.transition 2025, 3, :o5, 1743289200
-          tz.transition 2025, 10, :o6, 1761433200
-          tz.transition 2026, 3, :o5, 1774738800
-          tz.transition 2026, 10, :o6, 1792882800
-          tz.transition 2027, 3, :o5, 1806188400
-          tz.transition 2027, 10, :o6, 1824937200
-          tz.transition 2028, 3, :o5, 1837638000
-          tz.transition 2028, 10, :o6, 1856386800
-          tz.transition 2029, 3, :o5, 1869087600
-          tz.transition 2029, 10, :o6, 1887836400
-          tz.transition 2030, 3, :o5, 1901142000
-          tz.transition 2030, 10, :o6, 1919286000
-          tz.transition 2031, 3, :o5, 1932591600
-          tz.transition 2031, 10, :o6, 1950735600
-          tz.transition 2032, 3, :o5, 1964041200
-          tz.transition 2032, 10, :o6, 1982790000
-          tz.transition 2033, 3, :o5, 1995490800
-          tz.transition 2033, 10, :o6, 2014239600
-          tz.transition 2034, 3, :o5, 2026940400
-          tz.transition 2034, 10, :o6, 2045689200
-          tz.transition 2035, 3, :o5, 2058390000
-          tz.transition 2035, 10, :o6, 2077138800
-          tz.transition 2036, 3, :o5, 2090444400
-          tz.transition 2036, 10, :o6, 2108588400
-          tz.transition 2037, 3, :o5, 2121894000
-          tz.transition 2037, 10, :o6, 2140038000
-          tz.transition 2038, 3, :o5, 59172251, 24
-          tz.transition 2038, 10, :o6, 59177459, 24
-          tz.transition 2039, 3, :o5, 59180987, 24
-          tz.transition 2039, 10, :o6, 59186195, 24
-          tz.transition 2040, 3, :o5, 59189723, 24
-          tz.transition 2040, 10, :o6, 59194931, 24
-          tz.transition 2041, 3, :o5, 59198627, 24
-          tz.transition 2041, 10, :o6, 59203667, 24
-          tz.transition 2042, 3, :o5, 59207363, 24
-          tz.transition 2042, 10, :o6, 59212403, 24
-          tz.transition 2043, 3, :o5, 59216099, 24
-          tz.transition 2043, 10, :o6, 59221139, 24
-          tz.transition 2044, 3, :o5, 59224835, 24
-          tz.transition 2044, 10, :o6, 59230043, 24
-          tz.transition 2045, 3, :o5, 59233571, 24
-          tz.transition 2045, 10, :o6, 59238779, 24
-          tz.transition 2046, 3, :o5, 59242307, 24
-          tz.transition 2046, 10, :o6, 59247515, 24
-          tz.transition 2047, 3, :o5, 59251211, 24
-          tz.transition 2047, 10, :o6, 59256251, 24
-          tz.transition 2048, 3, :o5, 59259947, 24
-          tz.transition 2048, 10, :o6, 59264987, 24
-          tz.transition 2049, 3, :o5, 59268683, 24
-          tz.transition 2049, 10, :o6, 59273891, 24
-          tz.transition 2050, 3, :o5, 59277419, 24
-          tz.transition 2050, 10, :o6, 59282627, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Paris.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Paris.rb
deleted file mode 100644
index e3236c0ba1..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Paris.rb
+++ /dev/null
@@ -1,232 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Paris
-        include TimezoneDefinition
-        
-        timezone 'Europe/Paris' do |tz|
-          tz.offset :o0, 561, 0, :LMT
-          tz.offset :o1, 561, 0, :PMT
-          tz.offset :o2, 0, 0, :WET
-          tz.offset :o3, 0, 3600, :WEST
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 3600, 0, :CET
-          tz.offset :o6, 0, 7200, :WEMT
-          
-          tz.transition 1891, 3, :o1, 69460027033, 28800
-          tz.transition 1911, 3, :o2, 69670267033, 28800
-          tz.transition 1916, 6, :o3, 58104707, 24
-          tz.transition 1916, 10, :o2, 58107323, 24
-          tz.transition 1917, 3, :o3, 58111499, 24
-          tz.transition 1917, 10, :o2, 58116227, 24
-          tz.transition 1918, 3, :o3, 58119899, 24
-          tz.transition 1918, 10, :o2, 58124963, 24
-          tz.transition 1919, 3, :o3, 58128467, 24
-          tz.transition 1919, 10, :o2, 58133699, 24
-          tz.transition 1920, 2, :o3, 58136867, 24
-          tz.transition 1920, 10, :o2, 58142915, 24
-          tz.transition 1921, 3, :o3, 58146323, 24
-          tz.transition 1921, 10, :o2, 58151723, 24
-          tz.transition 1922, 3, :o3, 58155347, 24
-          tz.transition 1922, 10, :o2, 58160051, 24
-          tz.transition 1923, 5, :o3, 58165595, 24
-          tz.transition 1923, 10, :o2, 58168787, 24
-          tz.transition 1924, 3, :o3, 58172987, 24
-          tz.transition 1924, 10, :o2, 58177523, 24
-          tz.transition 1925, 4, :o3, 58181891, 24
-          tz.transition 1925, 10, :o2, 58186259, 24
-          tz.transition 1926, 4, :o3, 58190963, 24
-          tz.transition 1926, 10, :o2, 58194995, 24
-          tz.transition 1927, 4, :o3, 58199531, 24
-          tz.transition 1927, 10, :o2, 58203731, 24
-          tz.transition 1928, 4, :o3, 58208435, 24
-          tz.transition 1928, 10, :o2, 58212635, 24
-          tz.transition 1929, 4, :o3, 58217339, 24
-          tz.transition 1929, 10, :o2, 58221371, 24
-          tz.transition 1930, 4, :o3, 58225907, 24
-          tz.transition 1930, 10, :o2, 58230107, 24
-          tz.transition 1931, 4, :o3, 58234811, 24
-          tz.transition 1931, 10, :o2, 58238843, 24
-          tz.transition 1932, 4, :o3, 58243211, 24
-          tz.transition 1932, 10, :o2, 58247579, 24
-          tz.transition 1933, 3, :o3, 58251779, 24
-          tz.transition 1933, 10, :o2, 58256483, 24
-          tz.transition 1934, 4, :o3, 58260851, 24
-          tz.transition 1934, 10, :o2, 58265219, 24
-          tz.transition 1935, 3, :o3, 58269419, 24
-          tz.transition 1935, 10, :o2, 58273955, 24
-          tz.transition 1936, 4, :o3, 58278659, 24
-          tz.transition 1936, 10, :o2, 58282691, 24
-          tz.transition 1937, 4, :o3, 58287059, 24
-          tz.transition 1937, 10, :o2, 58291427, 24
-          tz.transition 1938, 3, :o3, 58295627, 24
-          tz.transition 1938, 10, :o2, 58300163, 24
-          tz.transition 1939, 4, :o3, 58304867, 24
-          tz.transition 1939, 11, :o2, 58310075, 24
-          tz.transition 1940, 2, :o3, 29156215, 12
-          tz.transition 1940, 6, :o4, 29157545, 12
-          tz.transition 1942, 11, :o5, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o5, 58344037, 24
-          tz.transition 1944, 4, :o4, 58348405, 24
-          tz.transition 1944, 8, :o6, 29175929, 12
-          tz.transition 1944, 10, :o3, 58352915, 24
-          tz.transition 1945, 4, :o6, 58357141, 24
-          tz.transition 1945, 9, :o5, 58361149, 24
-          tz.transition 1976, 3, :o4, 196819200
-          tz.transition 1976, 9, :o5, 212540400
-          tz.transition 1977, 4, :o4, 228877200
-          tz.transition 1977, 9, :o5, 243997200
-          tz.transition 1978, 4, :o4, 260326800
-          tz.transition 1978, 10, :o5, 276051600
-          tz.transition 1979, 4, :o4, 291776400
-          tz.transition 1979, 9, :o5, 307501200
-          tz.transition 1980, 4, :o4, 323830800
-          tz.transition 1980, 9, :o5, 338950800
-          tz.transition 1981, 3, :o4, 354675600
-          tz.transition 1981, 9, :o5, 370400400
-          tz.transition 1982, 3, :o4, 386125200
-          tz.transition 1982, 9, :o5, 401850000
-          tz.transition 1983, 3, :o4, 417574800
-          tz.transition 1983, 9, :o5, 433299600
-          tz.transition 1984, 3, :o4, 449024400
-          tz.transition 1984, 9, :o5, 465354000
-          tz.transition 1985, 3, :o4, 481078800
-          tz.transition 1985, 9, :o5, 496803600
-          tz.transition 1986, 3, :o4, 512528400
-          tz.transition 1986, 9, :o5, 528253200
-          tz.transition 1987, 3, :o4, 543978000
-          tz.transition 1987, 9, :o5, 559702800
-          tz.transition 1988, 3, :o4, 575427600
-          tz.transition 1988, 9, :o5, 591152400
-          tz.transition 1989, 3, :o4, 606877200
-          tz.transition 1989, 9, :o5, 622602000
-          tz.transition 1990, 3, :o4, 638326800
-          tz.transition 1990, 9, :o5, 654656400
-          tz.transition 1991, 3, :o4, 670381200
-          tz.transition 1991, 9, :o5, 686106000
-          tz.transition 1992, 3, :o4, 701830800
-          tz.transition 1992, 9, :o5, 717555600
-          tz.transition 1993, 3, :o4, 733280400
-          tz.transition 1993, 9, :o5, 749005200
-          tz.transition 1994, 3, :o4, 764730000
-          tz.transition 1994, 9, :o5, 780454800
-          tz.transition 1995, 3, :o4, 796179600
-          tz.transition 1995, 9, :o5, 811904400
-          tz.transition 1996, 3, :o4, 828234000
-          tz.transition 1996, 10, :o5, 846378000
-          tz.transition 1997, 3, :o4, 859683600
-          tz.transition 1997, 10, :o5, 877827600
-          tz.transition 1998, 3, :o4, 891133200
-          tz.transition 1998, 10, :o5, 909277200
-          tz.transition 1999, 3, :o4, 922582800
-          tz.transition 1999, 10, :o5, 941331600
-          tz.transition 2000, 3, :o4, 954032400
-          tz.transition 2000, 10, :o5, 972781200
-          tz.transition 2001, 3, :o4, 985482000
-          tz.transition 2001, 10, :o5, 1004230800
-          tz.transition 2002, 3, :o4, 1017536400
-          tz.transition 2002, 10, :o5, 1035680400
-          tz.transition 2003, 3, :o4, 1048986000
-          tz.transition 2003, 10, :o5, 1067130000
-          tz.transition 2004, 3, :o4, 1080435600
-          tz.transition 2004, 10, :o5, 1099184400
-          tz.transition 2005, 3, :o4, 1111885200
-          tz.transition 2005, 10, :o5, 1130634000
-          tz.transition 2006, 3, :o4, 1143334800
-          tz.transition 2006, 10, :o5, 1162083600
-          tz.transition 2007, 3, :o4, 1174784400
-          tz.transition 2007, 10, :o5, 1193533200
-          tz.transition 2008, 3, :o4, 1206838800
-          tz.transition 2008, 10, :o5, 1224982800
-          tz.transition 2009, 3, :o4, 1238288400
-          tz.transition 2009, 10, :o5, 1256432400
-          tz.transition 2010, 3, :o4, 1269738000
-          tz.transition 2010, 10, :o5, 1288486800
-          tz.transition 2011, 3, :o4, 1301187600
-          tz.transition 2011, 10, :o5, 1319936400
-          tz.transition 2012, 3, :o4, 1332637200
-          tz.transition 2012, 10, :o5, 1351386000
-          tz.transition 2013, 3, :o4, 1364691600
-          tz.transition 2013, 10, :o5, 1382835600
-          tz.transition 2014, 3, :o4, 1396141200
-          tz.transition 2014, 10, :o5, 1414285200
-          tz.transition 2015, 3, :o4, 1427590800
-          tz.transition 2015, 10, :o5, 1445734800
-          tz.transition 2016, 3, :o4, 1459040400
-          tz.transition 2016, 10, :o5, 1477789200
-          tz.transition 2017, 3, :o4, 1490490000
-          tz.transition 2017, 10, :o5, 1509238800
-          tz.transition 2018, 3, :o4, 1521939600
-          tz.transition 2018, 10, :o5, 1540688400
-          tz.transition 2019, 3, :o4, 1553994000
-          tz.transition 2019, 10, :o5, 1572138000
-          tz.transition 2020, 3, :o4, 1585443600
-          tz.transition 2020, 10, :o5, 1603587600
-          tz.transition 2021, 3, :o4, 1616893200
-          tz.transition 2021, 10, :o5, 1635642000
-          tz.transition 2022, 3, :o4, 1648342800
-          tz.transition 2022, 10, :o5, 1667091600
-          tz.transition 2023, 3, :o4, 1679792400
-          tz.transition 2023, 10, :o5, 1698541200
-          tz.transition 2024, 3, :o4, 1711846800
-          tz.transition 2024, 10, :o5, 1729990800
-          tz.transition 2025, 3, :o4, 1743296400
-          tz.transition 2025, 10, :o5, 1761440400
-          tz.transition 2026, 3, :o4, 1774746000
-          tz.transition 2026, 10, :o5, 1792890000
-          tz.transition 2027, 3, :o4, 1806195600
-          tz.transition 2027, 10, :o5, 1824944400
-          tz.transition 2028, 3, :o4, 1837645200
-          tz.transition 2028, 10, :o5, 1856394000
-          tz.transition 2029, 3, :o4, 1869094800
-          tz.transition 2029, 10, :o5, 1887843600
-          tz.transition 2030, 3, :o4, 1901149200
-          tz.transition 2030, 10, :o5, 1919293200
-          tz.transition 2031, 3, :o4, 1932598800
-          tz.transition 2031, 10, :o5, 1950742800
-          tz.transition 2032, 3, :o4, 1964048400
-          tz.transition 2032, 10, :o5, 1982797200
-          tz.transition 2033, 3, :o4, 1995498000
-          tz.transition 2033, 10, :o5, 2014246800
-          tz.transition 2034, 3, :o4, 2026947600
-          tz.transition 2034, 10, :o5, 2045696400
-          tz.transition 2035, 3, :o4, 2058397200
-          tz.transition 2035, 10, :o5, 2077146000
-          tz.transition 2036, 3, :o4, 2090451600
-          tz.transition 2036, 10, :o5, 2108595600
-          tz.transition 2037, 3, :o4, 2121901200
-          tz.transition 2037, 10, :o5, 2140045200
-          tz.transition 2038, 3, :o4, 59172253, 24
-          tz.transition 2038, 10, :o5, 59177461, 24
-          tz.transition 2039, 3, :o4, 59180989, 24
-          tz.transition 2039, 10, :o5, 59186197, 24
-          tz.transition 2040, 3, :o4, 59189725, 24
-          tz.transition 2040, 10, :o5, 59194933, 24
-          tz.transition 2041, 3, :o4, 59198629, 24
-          tz.transition 2041, 10, :o5, 59203669, 24
-          tz.transition 2042, 3, :o4, 59207365, 24
-          tz.transition 2042, 10, :o5, 59212405, 24
-          tz.transition 2043, 3, :o4, 59216101, 24
-          tz.transition 2043, 10, :o5, 59221141, 24
-          tz.transition 2044, 3, :o4, 59224837, 24
-          tz.transition 2044, 10, :o5, 59230045, 24
-          tz.transition 2045, 3, :o4, 59233573, 24
-          tz.transition 2045, 10, :o5, 59238781, 24
-          tz.transition 2046, 3, :o4, 59242309, 24
-          tz.transition 2046, 10, :o5, 59247517, 24
-          tz.transition 2047, 3, :o4, 59251213, 24
-          tz.transition 2047, 10, :o5, 59256253, 24
-          tz.transition 2048, 3, :o4, 59259949, 24
-          tz.transition 2048, 10, :o5, 59264989, 24
-          tz.transition 2049, 3, :o4, 59268685, 24
-          tz.transition 2049, 10, :o5, 59273893, 24
-          tz.transition 2050, 3, :o4, 59277421, 24
-          tz.transition 2050, 10, :o5, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Prague.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Prague.rb
deleted file mode 100644
index bcabee96c1..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Prague.rb
+++ /dev/null
@@ -1,187 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Prague
-        include TimezoneDefinition
-        
-        timezone 'Europe/Prague' do |tz|
-          tz.offset :o0, 3464, 0, :LMT
-          tz.offset :o1, 3464, 0, :PMT
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          
-          tz.transition 1849, 12, :o1, 25884991367, 10800
-          tz.transition 1891, 9, :o2, 26049669767, 10800
-          tz.transition 1916, 4, :o3, 29051813, 12
-          tz.transition 1916, 9, :o2, 58107299, 24
-          tz.transition 1917, 4, :o3, 58112029, 24
-          tz.transition 1917, 9, :o2, 58115725, 24
-          tz.transition 1918, 4, :o3, 58120765, 24
-          tz.transition 1918, 9, :o2, 58124461, 24
-          tz.transition 1940, 4, :o3, 58313293, 24
-          tz.transition 1942, 11, :o2, 58335973, 24
-          tz.transition 1943, 3, :o3, 58339501, 24
-          tz.transition 1943, 10, :o2, 58344037, 24
-          tz.transition 1944, 4, :o3, 58348405, 24
-          tz.transition 1944, 9, :o2, 58352413, 24
-          tz.transition 1945, 4, :o3, 58357285, 24
-          tz.transition 1945, 11, :o2, 58362661, 24
-          tz.transition 1946, 5, :o3, 58366717, 24
-          tz.transition 1946, 10, :o2, 58370389, 24
-          tz.transition 1947, 4, :o3, 58375093, 24
-          tz.transition 1947, 10, :o2, 58379125, 24
-          tz.transition 1948, 4, :o3, 58383829, 24
-          tz.transition 1948, 10, :o2, 58387861, 24
-          tz.transition 1949, 4, :o3, 58392373, 24
-          tz.transition 1949, 10, :o2, 58396597, 24
-          tz.transition 1979, 4, :o3, 291776400
-          tz.transition 1979, 9, :o2, 307501200
-          tz.transition 1980, 4, :o3, 323830800
-          tz.transition 1980, 9, :o2, 338950800
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Riga.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Riga.rb
deleted file mode 100644
index 784837f758..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Riga.rb
+++ /dev/null
@@ -1,176 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Riga
-        include TimezoneDefinition
-        
-        timezone 'Europe/Riga' do |tz|
-          tz.offset :o0, 5784, 0, :LMT
-          tz.offset :o1, 5784, 0, :RMT
-          tz.offset :o2, 5784, 3600, :LST
-          tz.offset :o3, 7200, 0, :EET
-          tz.offset :o4, 10800, 0, :MSK
-          tz.offset :o5, 3600, 3600, :CEST
-          tz.offset :o6, 3600, 0, :CET
-          tz.offset :o7, 10800, 3600, :MSD
-          tz.offset :o8, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 8667775559, 3600
-          tz.transition 1918, 4, :o2, 8718114659, 3600
-          tz.transition 1918, 9, :o1, 8718669059, 3600
-          tz.transition 1919, 4, :o2, 8719378259, 3600
-          tz.transition 1919, 5, :o1, 8719561859, 3600
-          tz.transition 1926, 5, :o3, 8728727159, 3600
-          tz.transition 1940, 8, :o4, 29158157, 12
-          tz.transition 1941, 6, :o5, 19441411, 8
-          tz.transition 1942, 11, :o6, 58335973, 24
-          tz.transition 1943, 3, :o5, 58339501, 24
-          tz.transition 1943, 10, :o6, 58344037, 24
-          tz.transition 1944, 4, :o5, 58348405, 24
-          tz.transition 1944, 10, :o6, 58352773, 24
-          tz.transition 1944, 10, :o4, 58353035, 24
-          tz.transition 1981, 3, :o7, 354920400
-          tz.transition 1981, 9, :o4, 370728000
-          tz.transition 1982, 3, :o7, 386456400
-          tz.transition 1982, 9, :o4, 402264000
-          tz.transition 1983, 3, :o7, 417992400
-          tz.transition 1983, 9, :o4, 433800000
-          tz.transition 1984, 3, :o7, 449614800
-          tz.transition 1984, 9, :o4, 465346800
-          tz.transition 1985, 3, :o7, 481071600
-          tz.transition 1985, 9, :o4, 496796400
-          tz.transition 1986, 3, :o7, 512521200
-          tz.transition 1986, 9, :o4, 528246000
-          tz.transition 1987, 3, :o7, 543970800
-          tz.transition 1987, 9, :o4, 559695600
-          tz.transition 1988, 3, :o7, 575420400
-          tz.transition 1988, 9, :o4, 591145200
-          tz.transition 1989, 3, :o8, 606870000
-          tz.transition 1989, 9, :o3, 622598400
-          tz.transition 1990, 3, :o8, 638323200
-          tz.transition 1990, 9, :o3, 654652800
-          tz.transition 1991, 3, :o8, 670377600
-          tz.transition 1991, 9, :o3, 686102400
-          tz.transition 1992, 3, :o8, 701827200
-          tz.transition 1992, 9, :o3, 717552000
-          tz.transition 1993, 3, :o8, 733276800
-          tz.transition 1993, 9, :o3, 749001600
-          tz.transition 1994, 3, :o8, 764726400
-          tz.transition 1994, 9, :o3, 780451200
-          tz.transition 1995, 3, :o8, 796176000
-          tz.transition 1995, 9, :o3, 811900800
-          tz.transition 1996, 3, :o8, 828230400
-          tz.transition 1996, 9, :o3, 843955200
-          tz.transition 1997, 3, :o8, 859683600
-          tz.transition 1997, 10, :o3, 877827600
-          tz.transition 1998, 3, :o8, 891133200
-          tz.transition 1998, 10, :o3, 909277200
-          tz.transition 1999, 3, :o8, 922582800
-          tz.transition 1999, 10, :o3, 941331600
-          tz.transition 2001, 3, :o8, 985482000
-          tz.transition 2001, 10, :o3, 1004230800
-          tz.transition 2002, 3, :o8, 1017536400
-          tz.transition 2002, 10, :o3, 1035680400
-          tz.transition 2003, 3, :o8, 1048986000
-          tz.transition 2003, 10, :o3, 1067130000
-          tz.transition 2004, 3, :o8, 1080435600
-          tz.transition 2004, 10, :o3, 1099184400
-          tz.transition 2005, 3, :o8, 1111885200
-          tz.transition 2005, 10, :o3, 1130634000
-          tz.transition 2006, 3, :o8, 1143334800
-          tz.transition 2006, 10, :o3, 1162083600
-          tz.transition 2007, 3, :o8, 1174784400
-          tz.transition 2007, 10, :o3, 1193533200
-          tz.transition 2008, 3, :o8, 1206838800
-          tz.transition 2008, 10, :o3, 1224982800
-          tz.transition 2009, 3, :o8, 1238288400
-          tz.transition 2009, 10, :o3, 1256432400
-          tz.transition 2010, 3, :o8, 1269738000
-          tz.transition 2010, 10, :o3, 1288486800
-          tz.transition 2011, 3, :o8, 1301187600
-          tz.transition 2011, 10, :o3, 1319936400
-          tz.transition 2012, 3, :o8, 1332637200
-          tz.transition 2012, 10, :o3, 1351386000
-          tz.transition 2013, 3, :o8, 1364691600
-          tz.transition 2013, 10, :o3, 1382835600
-          tz.transition 2014, 3, :o8, 1396141200
-          tz.transition 2014, 10, :o3, 1414285200
-          tz.transition 2015, 3, :o8, 1427590800
-          tz.transition 2015, 10, :o3, 1445734800
-          tz.transition 2016, 3, :o8, 1459040400
-          tz.transition 2016, 10, :o3, 1477789200
-          tz.transition 2017, 3, :o8, 1490490000
-          tz.transition 2017, 10, :o3, 1509238800
-          tz.transition 2018, 3, :o8, 1521939600
-          tz.transition 2018, 10, :o3, 1540688400
-          tz.transition 2019, 3, :o8, 1553994000
-          tz.transition 2019, 10, :o3, 1572138000
-          tz.transition 2020, 3, :o8, 1585443600
-          tz.transition 2020, 10, :o3, 1603587600
-          tz.transition 2021, 3, :o8, 1616893200
-          tz.transition 2021, 10, :o3, 1635642000
-          tz.transition 2022, 3, :o8, 1648342800
-          tz.transition 2022, 10, :o3, 1667091600
-          tz.transition 2023, 3, :o8, 1679792400
-          tz.transition 2023, 10, :o3, 1698541200
-          tz.transition 2024, 3, :o8, 1711846800
-          tz.transition 2024, 10, :o3, 1729990800
-          tz.transition 2025, 3, :o8, 1743296400
-          tz.transition 2025, 10, :o3, 1761440400
-          tz.transition 2026, 3, :o8, 1774746000
-          tz.transition 2026, 10, :o3, 1792890000
-          tz.transition 2027, 3, :o8, 1806195600
-          tz.transition 2027, 10, :o3, 1824944400
-          tz.transition 2028, 3, :o8, 1837645200
-          tz.transition 2028, 10, :o3, 1856394000
-          tz.transition 2029, 3, :o8, 1869094800
-          tz.transition 2029, 10, :o3, 1887843600
-          tz.transition 2030, 3, :o8, 1901149200
-          tz.transition 2030, 10, :o3, 1919293200
-          tz.transition 2031, 3, :o8, 1932598800
-          tz.transition 2031, 10, :o3, 1950742800
-          tz.transition 2032, 3, :o8, 1964048400
-          tz.transition 2032, 10, :o3, 1982797200
-          tz.transition 2033, 3, :o8, 1995498000
-          tz.transition 2033, 10, :o3, 2014246800
-          tz.transition 2034, 3, :o8, 2026947600
-          tz.transition 2034, 10, :o3, 2045696400
-          tz.transition 2035, 3, :o8, 2058397200
-          tz.transition 2035, 10, :o3, 2077146000
-          tz.transition 2036, 3, :o8, 2090451600
-          tz.transition 2036, 10, :o3, 2108595600
-          tz.transition 2037, 3, :o8, 2121901200
-          tz.transition 2037, 10, :o3, 2140045200
-          tz.transition 2038, 3, :o8, 59172253, 24
-          tz.transition 2038, 10, :o3, 59177461, 24
-          tz.transition 2039, 3, :o8, 59180989, 24
-          tz.transition 2039, 10, :o3, 59186197, 24
-          tz.transition 2040, 3, :o8, 59189725, 24
-          tz.transition 2040, 10, :o3, 59194933, 24
-          tz.transition 2041, 3, :o8, 59198629, 24
-          tz.transition 2041, 10, :o3, 59203669, 24
-          tz.transition 2042, 3, :o8, 59207365, 24
-          tz.transition 2042, 10, :o3, 59212405, 24
-          tz.transition 2043, 3, :o8, 59216101, 24
-          tz.transition 2043, 10, :o3, 59221141, 24
-          tz.transition 2044, 3, :o8, 59224837, 24
-          tz.transition 2044, 10, :o3, 59230045, 24
-          tz.transition 2045, 3, :o8, 59233573, 24
-          tz.transition 2045, 10, :o3, 59238781, 24
-          tz.transition 2046, 3, :o8, 59242309, 24
-          tz.transition 2046, 10, :o3, 59247517, 24
-          tz.transition 2047, 3, :o8, 59251213, 24
-          tz.transition 2047, 10, :o3, 59256253, 24
-          tz.transition 2048, 3, :o8, 59259949, 24
-          tz.transition 2048, 10, :o3, 59264989, 24
-          tz.transition 2049, 3, :o8, 59268685, 24
-          tz.transition 2049, 10, :o3, 59273893, 24
-          tz.transition 2050, 3, :o8, 59277421, 24
-          tz.transition 2050, 10, :o3, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Rome.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Rome.rb
deleted file mode 100644
index aa7b43d9d2..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Rome.rb
+++ /dev/null
@@ -1,215 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Rome
-        include TimezoneDefinition
-        
-        timezone 'Europe/Rome' do |tz|
-          tz.offset :o0, 2996, 0, :LMT
-          tz.offset :o1, 2996, 0, :RMT
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          
-          tz.transition 1866, 9, :o1, 51901915651, 21600
-          tz.transition 1893, 10, :o2, 52115798851, 21600
-          tz.transition 1916, 6, :o3, 58104419, 24
-          tz.transition 1916, 9, :o2, 58107299, 24
-          tz.transition 1917, 3, :o3, 58111667, 24
-          tz.transition 1917, 9, :o2, 58116035, 24
-          tz.transition 1918, 3, :o3, 58119899, 24
-          tz.transition 1918, 10, :o2, 58124939, 24
-          tz.transition 1919, 3, :o3, 58128467, 24
-          tz.transition 1919, 10, :o2, 58133675, 24
-          tz.transition 1920, 3, :o3, 58137707, 24
-          tz.transition 1920, 9, :o2, 58142075, 24
-          tz.transition 1940, 6, :o3, 58315091, 24
-          tz.transition 1942, 11, :o2, 58335973, 24
-          tz.transition 1943, 3, :o3, 58339501, 24
-          tz.transition 1943, 10, :o2, 58344037, 24
-          tz.transition 1944, 4, :o3, 58348405, 24
-          tz.transition 1944, 9, :o2, 58352411, 24
-          tz.transition 1945, 4, :o3, 58357141, 24
-          tz.transition 1945, 9, :o2, 58361123, 24
-          tz.transition 1946, 3, :o3, 58365517, 24
-          tz.transition 1946, 10, :o2, 58370389, 24
-          tz.transition 1947, 3, :o3, 58374251, 24
-          tz.transition 1947, 10, :o2, 58379123, 24
-          tz.transition 1948, 2, :o3, 58382653, 24
-          tz.transition 1948, 10, :o2, 58387861, 24
-          tz.transition 1966, 5, :o3, 58542419, 24
-          tz.transition 1966, 9, :o2, 29272721, 12
-          tz.transition 1967, 5, :o3, 58551323, 24
-          tz.transition 1967, 9, :o2, 29277089, 12
-          tz.transition 1968, 5, :o3, 58560059, 24
-          tz.transition 1968, 9, :o2, 29281457, 12
-          tz.transition 1969, 5, :o3, 58568963, 24
-          tz.transition 1969, 9, :o2, 29285909, 12
-          tz.transition 1970, 5, :o3, 12956400
-          tz.transition 1970, 9, :o2, 23234400
-          tz.transition 1971, 5, :o3, 43801200
-          tz.transition 1971, 9, :o2, 54687600
-          tz.transition 1972, 5, :o3, 75855600
-          tz.transition 1972, 9, :o2, 86738400
-          tz.transition 1973, 6, :o3, 107910000
-          tz.transition 1973, 9, :o2, 118188000
-          tz.transition 1974, 5, :o3, 138754800
-          tz.transition 1974, 9, :o2, 149637600
-          tz.transition 1975, 5, :o3, 170809200
-          tz.transition 1975, 9, :o2, 181090800
-          tz.transition 1976, 5, :o3, 202258800
-          tz.transition 1976, 9, :o2, 212540400
-          tz.transition 1977, 5, :o3, 233103600
-          tz.transition 1977, 9, :o2, 243990000
-          tz.transition 1978, 5, :o3, 265158000
-          tz.transition 1978, 9, :o2, 276044400
-          tz.transition 1979, 5, :o3, 296607600
-          tz.transition 1979, 9, :o2, 307494000
-          tz.transition 1980, 4, :o3, 323830800
-          tz.transition 1980, 9, :o2, 338950800
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Sarajevo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Sarajevo.rb
deleted file mode 100644
index 068c5fe6ad..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Sarajevo.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Sarajevo
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Sarajevo', 'Europe/Belgrade'
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Skopje.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Skopje.rb
deleted file mode 100644
index 10b71f285e..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Skopje.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Skopje
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Skopje', 'Europe/Belgrade'
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Sofia.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Sofia.rb
deleted file mode 100644
index 38a70eceb9..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Sofia.rb
+++ /dev/null
@@ -1,173 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Sofia
-        include TimezoneDefinition
-        
-        timezone 'Europe/Sofia' do |tz|
-          tz.offset :o0, 5596, 0, :LMT
-          tz.offset :o1, 7016, 0, :IMT
-          tz.offset :o2, 7200, 0, :EET
-          tz.offset :o3, 3600, 0, :CET
-          tz.offset :o4, 3600, 3600, :CEST
-          tz.offset :o5, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 52006653401, 21600
-          tz.transition 1894, 11, :o2, 26062154123, 10800
-          tz.transition 1942, 11, :o3, 58335973, 24
-          tz.transition 1943, 3, :o4, 58339501, 24
-          tz.transition 1943, 10, :o3, 58344037, 24
-          tz.transition 1944, 4, :o4, 58348405, 24
-          tz.transition 1944, 10, :o3, 58352773, 24
-          tz.transition 1945, 4, :o2, 29178571, 12
-          tz.transition 1979, 3, :o5, 291762000
-          tz.transition 1979, 9, :o2, 307576800
-          tz.transition 1980, 4, :o5, 323816400
-          tz.transition 1980, 9, :o2, 339026400
-          tz.transition 1981, 4, :o5, 355266000
-          tz.transition 1981, 9, :o2, 370393200
-          tz.transition 1982, 4, :o5, 386715600
-          tz.transition 1982, 9, :o2, 401846400
-          tz.transition 1983, 3, :o5, 417571200
-          tz.transition 1983, 9, :o2, 433296000
-          tz.transition 1984, 3, :o5, 449020800
-          tz.transition 1984, 9, :o2, 465350400
-          tz.transition 1985, 3, :o5, 481075200
-          tz.transition 1985, 9, :o2, 496800000
-          tz.transition 1986, 3, :o5, 512524800
-          tz.transition 1986, 9, :o2, 528249600
-          tz.transition 1987, 3, :o5, 543974400
-          tz.transition 1987, 9, :o2, 559699200
-          tz.transition 1988, 3, :o5, 575424000
-          tz.transition 1988, 9, :o2, 591148800
-          tz.transition 1989, 3, :o5, 606873600
-          tz.transition 1989, 9, :o2, 622598400
-          tz.transition 1990, 3, :o5, 638323200
-          tz.transition 1990, 9, :o2, 654652800
-          tz.transition 1991, 3, :o5, 670370400
-          tz.transition 1991, 9, :o2, 686091600
-          tz.transition 1992, 3, :o5, 701820000
-          tz.transition 1992, 9, :o2, 717541200
-          tz.transition 1993, 3, :o5, 733269600
-          tz.transition 1993, 9, :o2, 748990800
-          tz.transition 1994, 3, :o5, 764719200
-          tz.transition 1994, 9, :o2, 780440400
-          tz.transition 1995, 3, :o5, 796168800
-          tz.transition 1995, 9, :o2, 811890000
-          tz.transition 1996, 3, :o5, 828223200
-          tz.transition 1996, 10, :o2, 846363600
-          tz.transition 1997, 3, :o5, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o5, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o5, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o5, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o5, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o5, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o5, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o5, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o5, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o5, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o5, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o5, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o5, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o5, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o5, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o5, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o5, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o5, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o5, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o5, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o5, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o5, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o5, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o5, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o5, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o5, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o5, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o5, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o5, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o5, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o5, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o5, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o5, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o5, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o5, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o5, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o5, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o5, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o5, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o5, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o5, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o5, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o5, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o5, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o5, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o5, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o5, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o5, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o5, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o5, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o5, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o5, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o5, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o5, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Stockholm.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Stockholm.rb
deleted file mode 100644
index 43db70fa61..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Stockholm.rb
+++ /dev/null
@@ -1,165 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Stockholm
-        include TimezoneDefinition
-        
-        timezone 'Europe/Stockholm' do |tz|
-          tz.offset :o0, 4332, 0, :LMT
-          tz.offset :o1, 3614, 0, :SET
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          
-          tz.transition 1878, 12, :o1, 17332923239, 7200
-          tz.transition 1899, 12, :o2, 104328883793, 43200
-          tz.transition 1916, 5, :o3, 29051981, 12
-          tz.transition 1916, 9, :o2, 58107299, 24
-          tz.transition 1980, 4, :o3, 323830800
-          tz.transition 1980, 9, :o2, 338950800
-          tz.transition 1981, 3, :o3, 354675600
-          tz.transition 1981, 9, :o2, 370400400
-          tz.transition 1982, 3, :o3, 386125200
-          tz.transition 1982, 9, :o2, 401850000
-          tz.transition 1983, 3, :o3, 417574800
-          tz.transition 1983, 9, :o2, 433299600
-          tz.transition 1984, 3, :o3, 449024400
-          tz.transition 1984, 9, :o2, 465354000
-          tz.transition 1985, 3, :o3, 481078800
-          tz.transition 1985, 9, :o2, 496803600
-          tz.transition 1986, 3, :o3, 512528400
-          tz.transition 1986, 9, :o2, 528253200
-          tz.transition 1987, 3, :o3, 543978000
-          tz.transition 1987, 9, :o2, 559702800
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Tallinn.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Tallinn.rb
deleted file mode 100644
index de5a8569f3..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Tallinn.rb
+++ /dev/null
@@ -1,172 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Tallinn
-        include TimezoneDefinition
-        
-        timezone 'Europe/Tallinn' do |tz|
-          tz.offset :o0, 5940, 0, :LMT
-          tz.offset :o1, 5940, 0, :TMT
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          tz.offset :o4, 7200, 0, :EET
-          tz.offset :o5, 10800, 0, :MSK
-          tz.offset :o6, 10800, 3600, :MSD
-          tz.offset :o7, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 385234469, 160
-          tz.transition 1918, 1, :o2, 387460069, 160
-          tz.transition 1918, 4, :o3, 58120765, 24
-          tz.transition 1918, 9, :o2, 58124461, 24
-          tz.transition 1919, 6, :o1, 58131371, 24
-          tz.transition 1921, 4, :o4, 387649669, 160
-          tz.transition 1940, 8, :o5, 29158169, 12
-          tz.transition 1941, 9, :o3, 19442019, 8
-          tz.transition 1942, 11, :o2, 58335973, 24
-          tz.transition 1943, 3, :o3, 58339501, 24
-          tz.transition 1943, 10, :o2, 58344037, 24
-          tz.transition 1944, 4, :o3, 58348405, 24
-          tz.transition 1944, 9, :o5, 29176265, 12
-          tz.transition 1981, 3, :o6, 354920400
-          tz.transition 1981, 9, :o5, 370728000
-          tz.transition 1982, 3, :o6, 386456400
-          tz.transition 1982, 9, :o5, 402264000
-          tz.transition 1983, 3, :o6, 417992400
-          tz.transition 1983, 9, :o5, 433800000
-          tz.transition 1984, 3, :o6, 449614800
-          tz.transition 1984, 9, :o5, 465346800
-          tz.transition 1985, 3, :o6, 481071600
-          tz.transition 1985, 9, :o5, 496796400
-          tz.transition 1986, 3, :o6, 512521200
-          tz.transition 1986, 9, :o5, 528246000
-          tz.transition 1987, 3, :o6, 543970800
-          tz.transition 1987, 9, :o5, 559695600
-          tz.transition 1988, 3, :o6, 575420400
-          tz.transition 1988, 9, :o5, 591145200
-          tz.transition 1989, 3, :o7, 606870000
-          tz.transition 1989, 9, :o4, 622598400
-          tz.transition 1990, 3, :o7, 638323200
-          tz.transition 1990, 9, :o4, 654652800
-          tz.transition 1991, 3, :o7, 670377600
-          tz.transition 1991, 9, :o4, 686102400
-          tz.transition 1992, 3, :o7, 701827200
-          tz.transition 1992, 9, :o4, 717552000
-          tz.transition 1993, 3, :o7, 733276800
-          tz.transition 1993, 9, :o4, 749001600
-          tz.transition 1994, 3, :o7, 764726400
-          tz.transition 1994, 9, :o4, 780451200
-          tz.transition 1995, 3, :o7, 796176000
-          tz.transition 1995, 9, :o4, 811900800
-          tz.transition 1996, 3, :o7, 828230400
-          tz.transition 1996, 10, :o4, 846374400
-          tz.transition 1997, 3, :o7, 859680000
-          tz.transition 1997, 10, :o4, 877824000
-          tz.transition 1998, 3, :o7, 891129600
-          tz.transition 1998, 10, :o4, 909277200
-          tz.transition 1999, 3, :o7, 922582800
-          tz.transition 1999, 10, :o4, 941331600
-          tz.transition 2002, 3, :o7, 1017536400
-          tz.transition 2002, 10, :o4, 1035680400
-          tz.transition 2003, 3, :o7, 1048986000
-          tz.transition 2003, 10, :o4, 1067130000
-          tz.transition 2004, 3, :o7, 1080435600
-          tz.transition 2004, 10, :o4, 1099184400
-          tz.transition 2005, 3, :o7, 1111885200
-          tz.transition 2005, 10, :o4, 1130634000
-          tz.transition 2006, 3, :o7, 1143334800
-          tz.transition 2006, 10, :o4, 1162083600
-          tz.transition 2007, 3, :o7, 1174784400
-          tz.transition 2007, 10, :o4, 1193533200
-          tz.transition 2008, 3, :o7, 1206838800
-          tz.transition 2008, 10, :o4, 1224982800
-          tz.transition 2009, 3, :o7, 1238288400
-          tz.transition 2009, 10, :o4, 1256432400
-          tz.transition 2010, 3, :o7, 1269738000
-          tz.transition 2010, 10, :o4, 1288486800
-          tz.transition 2011, 3, :o7, 1301187600
-          tz.transition 2011, 10, :o4, 1319936400
-          tz.transition 2012, 3, :o7, 1332637200
-          tz.transition 2012, 10, :o4, 1351386000
-          tz.transition 2013, 3, :o7, 1364691600
-          tz.transition 2013, 10, :o4, 1382835600
-          tz.transition 2014, 3, :o7, 1396141200
-          tz.transition 2014, 10, :o4, 1414285200
-          tz.transition 2015, 3, :o7, 1427590800
-          tz.transition 2015, 10, :o4, 1445734800
-          tz.transition 2016, 3, :o7, 1459040400
-          tz.transition 2016, 10, :o4, 1477789200
-          tz.transition 2017, 3, :o7, 1490490000
-          tz.transition 2017, 10, :o4, 1509238800
-          tz.transition 2018, 3, :o7, 1521939600
-          tz.transition 2018, 10, :o4, 1540688400
-          tz.transition 2019, 3, :o7, 1553994000
-          tz.transition 2019, 10, :o4, 1572138000
-          tz.transition 2020, 3, :o7, 1585443600
-          tz.transition 2020, 10, :o4, 1603587600
-          tz.transition 2021, 3, :o7, 1616893200
-          tz.transition 2021, 10, :o4, 1635642000
-          tz.transition 2022, 3, :o7, 1648342800
-          tz.transition 2022, 10, :o4, 1667091600
-          tz.transition 2023, 3, :o7, 1679792400
-          tz.transition 2023, 10, :o4, 1698541200
-          tz.transition 2024, 3, :o7, 1711846800
-          tz.transition 2024, 10, :o4, 1729990800
-          tz.transition 2025, 3, :o7, 1743296400
-          tz.transition 2025, 10, :o4, 1761440400
-          tz.transition 2026, 3, :o7, 1774746000
-          tz.transition 2026, 10, :o4, 1792890000
-          tz.transition 2027, 3, :o7, 1806195600
-          tz.transition 2027, 10, :o4, 1824944400
-          tz.transition 2028, 3, :o7, 1837645200
-          tz.transition 2028, 10, :o4, 1856394000
-          tz.transition 2029, 3, :o7, 1869094800
-          tz.transition 2029, 10, :o4, 1887843600
-          tz.transition 2030, 3, :o7, 1901149200
-          tz.transition 2030, 10, :o4, 1919293200
-          tz.transition 2031, 3, :o7, 1932598800
-          tz.transition 2031, 10, :o4, 1950742800
-          tz.transition 2032, 3, :o7, 1964048400
-          tz.transition 2032, 10, :o4, 1982797200
-          tz.transition 2033, 3, :o7, 1995498000
-          tz.transition 2033, 10, :o4, 2014246800
-          tz.transition 2034, 3, :o7, 2026947600
-          tz.transition 2034, 10, :o4, 2045696400
-          tz.transition 2035, 3, :o7, 2058397200
-          tz.transition 2035, 10, :o4, 2077146000
-          tz.transition 2036, 3, :o7, 2090451600
-          tz.transition 2036, 10, :o4, 2108595600
-          tz.transition 2037, 3, :o7, 2121901200
-          tz.transition 2037, 10, :o4, 2140045200
-          tz.transition 2038, 3, :o7, 59172253, 24
-          tz.transition 2038, 10, :o4, 59177461, 24
-          tz.transition 2039, 3, :o7, 59180989, 24
-          tz.transition 2039, 10, :o4, 59186197, 24
-          tz.transition 2040, 3, :o7, 59189725, 24
-          tz.transition 2040, 10, :o4, 59194933, 24
-          tz.transition 2041, 3, :o7, 59198629, 24
-          tz.transition 2041, 10, :o4, 59203669, 24
-          tz.transition 2042, 3, :o7, 59207365, 24
-          tz.transition 2042, 10, :o4, 59212405, 24
-          tz.transition 2043, 3, :o7, 59216101, 24
-          tz.transition 2043, 10, :o4, 59221141, 24
-          tz.transition 2044, 3, :o7, 59224837, 24
-          tz.transition 2044, 10, :o4, 59230045, 24
-          tz.transition 2045, 3, :o7, 59233573, 24
-          tz.transition 2045, 10, :o4, 59238781, 24
-          tz.transition 2046, 3, :o7, 59242309, 24
-          tz.transition 2046, 10, :o4, 59247517, 24
-          tz.transition 2047, 3, :o7, 59251213, 24
-          tz.transition 2047, 10, :o4, 59256253, 24
-          tz.transition 2048, 3, :o7, 59259949, 24
-          tz.transition 2048, 10, :o4, 59264989, 24
-          tz.transition 2049, 3, :o7, 59268685, 24
-          tz.transition 2049, 10, :o4, 59273893, 24
-          tz.transition 2050, 3, :o7, 59277421, 24
-          tz.transition 2050, 10, :o4, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Vienna.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Vienna.rb
deleted file mode 100644
index 990aabab66..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Vienna.rb
+++ /dev/null
@@ -1,183 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Vienna
-        include TimezoneDefinition
-        
-        timezone 'Europe/Vienna' do |tz|
-          tz.offset :o0, 3920, 0, :LMT
-          tz.offset :o1, 3600, 0, :CET
-          tz.offset :o2, 3600, 3600, :CEST
-          
-          tz.transition 1893, 3, :o1, 2605558811, 1080
-          tz.transition 1916, 4, :o2, 29051813, 12
-          tz.transition 1916, 9, :o1, 58107299, 24
-          tz.transition 1917, 4, :o2, 58112029, 24
-          tz.transition 1917, 9, :o1, 58115725, 24
-          tz.transition 1918, 4, :o2, 58120765, 24
-          tz.transition 1918, 9, :o1, 58124461, 24
-          tz.transition 1920, 4, :o2, 58138069, 24
-          tz.transition 1920, 9, :o1, 58141933, 24
-          tz.transition 1940, 4, :o2, 58313293, 24
-          tz.transition 1942, 11, :o1, 58335973, 24
-          tz.transition 1943, 3, :o2, 58339501, 24
-          tz.transition 1943, 10, :o1, 58344037, 24
-          tz.transition 1944, 4, :o2, 58348405, 24
-          tz.transition 1944, 10, :o1, 58352773, 24
-          tz.transition 1945, 4, :o2, 58357141, 24
-          tz.transition 1945, 4, :o1, 58357381, 24
-          tz.transition 1946, 4, :o2, 58366189, 24
-          tz.transition 1946, 10, :o1, 58370389, 24
-          tz.transition 1947, 4, :o2, 58374757, 24
-          tz.transition 1947, 10, :o1, 58379125, 24
-          tz.transition 1948, 4, :o2, 58383829, 24
-          tz.transition 1948, 10, :o1, 58387861, 24
-          tz.transition 1980, 4, :o2, 323823600
-          tz.transition 1980, 9, :o1, 338940000
-          tz.transition 1981, 3, :o2, 354675600
-          tz.transition 1981, 9, :o1, 370400400
-          tz.transition 1982, 3, :o2, 386125200
-          tz.transition 1982, 9, :o1, 401850000
-          tz.transition 1983, 3, :o2, 417574800
-          tz.transition 1983, 9, :o1, 433299600
-          tz.transition 1984, 3, :o2, 449024400
-          tz.transition 1984, 9, :o1, 465354000
-          tz.transition 1985, 3, :o2, 481078800
-          tz.transition 1985, 9, :o1, 496803600
-          tz.transition 1986, 3, :o2, 512528400
-          tz.transition 1986, 9, :o1, 528253200
-          tz.transition 1987, 3, :o2, 543978000
-          tz.transition 1987, 9, :o1, 559702800
-          tz.transition 1988, 3, :o2, 575427600
-          tz.transition 1988, 9, :o1, 591152400
-          tz.transition 1989, 3, :o2, 606877200
-          tz.transition 1989, 9, :o1, 622602000
-          tz.transition 1990, 3, :o2, 638326800
-          tz.transition 1990, 9, :o1, 654656400
-          tz.transition 1991, 3, :o2, 670381200
-          tz.transition 1991, 9, :o1, 686106000
-          tz.transition 1992, 3, :o2, 701830800
-          tz.transition 1992, 9, :o1, 717555600
-          tz.transition 1993, 3, :o2, 733280400
-          tz.transition 1993, 9, :o1, 749005200
-          tz.transition 1994, 3, :o2, 764730000
-          tz.transition 1994, 9, :o1, 780454800
-          tz.transition 1995, 3, :o2, 796179600
-          tz.transition 1995, 9, :o1, 811904400
-          tz.transition 1996, 3, :o2, 828234000
-          tz.transition 1996, 10, :o1, 846378000
-          tz.transition 1997, 3, :o2, 859683600
-          tz.transition 1997, 10, :o1, 877827600
-          tz.transition 1998, 3, :o2, 891133200
-          tz.transition 1998, 10, :o1, 909277200
-          tz.transition 1999, 3, :o2, 922582800
-          tz.transition 1999, 10, :o1, 941331600
-          tz.transition 2000, 3, :o2, 954032400
-          tz.transition 2000, 10, :o1, 972781200
-          tz.transition 2001, 3, :o2, 985482000
-          tz.transition 2001, 10, :o1, 1004230800
-          tz.transition 2002, 3, :o2, 1017536400
-          tz.transition 2002, 10, :o1, 1035680400
-          tz.transition 2003, 3, :o2, 1048986000
-          tz.transition 2003, 10, :o1, 1067130000
-          tz.transition 2004, 3, :o2, 1080435600
-          tz.transition 2004, 10, :o1, 1099184400
-          tz.transition 2005, 3, :o2, 1111885200
-          tz.transition 2005, 10, :o1, 1130634000
-          tz.transition 2006, 3, :o2, 1143334800
-          tz.transition 2006, 10, :o1, 1162083600
-          tz.transition 2007, 3, :o2, 1174784400
-          tz.transition 2007, 10, :o1, 1193533200
-          tz.transition 2008, 3, :o2, 1206838800
-          tz.transition 2008, 10, :o1, 1224982800
-          tz.transition 2009, 3, :o2, 1238288400
-          tz.transition 2009, 10, :o1, 1256432400
-          tz.transition 2010, 3, :o2, 1269738000
-          tz.transition 2010, 10, :o1, 1288486800
-          tz.transition 2011, 3, :o2, 1301187600
-          tz.transition 2011, 10, :o1, 1319936400
-          tz.transition 2012, 3, :o2, 1332637200
-          tz.transition 2012, 10, :o1, 1351386000
-          tz.transition 2013, 3, :o2, 1364691600
-          tz.transition 2013, 10, :o1, 1382835600
-          tz.transition 2014, 3, :o2, 1396141200
-          tz.transition 2014, 10, :o1, 1414285200
-          tz.transition 2015, 3, :o2, 1427590800
-          tz.transition 2015, 10, :o1, 1445734800
-          tz.transition 2016, 3, :o2, 1459040400
-          tz.transition 2016, 10, :o1, 1477789200
-          tz.transition 2017, 3, :o2, 1490490000
-          tz.transition 2017, 10, :o1, 1509238800
-          tz.transition 2018, 3, :o2, 1521939600
-          tz.transition 2018, 10, :o1, 1540688400
-          tz.transition 2019, 3, :o2, 1553994000
-          tz.transition 2019, 10, :o1, 1572138000
-          tz.transition 2020, 3, :o2, 1585443600
-          tz.transition 2020, 10, :o1, 1603587600
-          tz.transition 2021, 3, :o2, 1616893200
-          tz.transition 2021, 10, :o1, 1635642000
-          tz.transition 2022, 3, :o2, 1648342800
-          tz.transition 2022, 10, :o1, 1667091600
-          tz.transition 2023, 3, :o2, 1679792400
-          tz.transition 2023, 10, :o1, 1698541200
-          tz.transition 2024, 3, :o2, 1711846800
-          tz.transition 2024, 10, :o1, 1729990800
-          tz.transition 2025, 3, :o2, 1743296400
-          tz.transition 2025, 10, :o1, 1761440400
-          tz.transition 2026, 3, :o2, 1774746000
-          tz.transition 2026, 10, :o1, 1792890000
-          tz.transition 2027, 3, :o2, 1806195600
-          tz.transition 2027, 10, :o1, 1824944400
-          tz.transition 2028, 3, :o2, 1837645200
-          tz.transition 2028, 10, :o1, 1856394000
-          tz.transition 2029, 3, :o2, 1869094800
-          tz.transition 2029, 10, :o1, 1887843600
-          tz.transition 2030, 3, :o2, 1901149200
-          tz.transition 2030, 10, :o1, 1919293200
-          tz.transition 2031, 3, :o2, 1932598800
-          tz.transition 2031, 10, :o1, 1950742800
-          tz.transition 2032, 3, :o2, 1964048400
-          tz.transition 2032, 10, :o1, 1982797200
-          tz.transition 2033, 3, :o2, 1995498000
-          tz.transition 2033, 10, :o1, 2014246800
-          tz.transition 2034, 3, :o2, 2026947600
-          tz.transition 2034, 10, :o1, 2045696400
-          tz.transition 2035, 3, :o2, 2058397200
-          tz.transition 2035, 10, :o1, 2077146000
-          tz.transition 2036, 3, :o2, 2090451600
-          tz.transition 2036, 10, :o1, 2108595600
-          tz.transition 2037, 3, :o2, 2121901200
-          tz.transition 2037, 10, :o1, 2140045200
-          tz.transition 2038, 3, :o2, 59172253, 24
-          tz.transition 2038, 10, :o1, 59177461, 24
-          tz.transition 2039, 3, :o2, 59180989, 24
-          tz.transition 2039, 10, :o1, 59186197, 24
-          tz.transition 2040, 3, :o2, 59189725, 24
-          tz.transition 2040, 10, :o1, 59194933, 24
-          tz.transition 2041, 3, :o2, 59198629, 24
-          tz.transition 2041, 10, :o1, 59203669, 24
-          tz.transition 2042, 3, :o2, 59207365, 24
-          tz.transition 2042, 10, :o1, 59212405, 24
-          tz.transition 2043, 3, :o2, 59216101, 24
-          tz.transition 2043, 10, :o1, 59221141, 24
-          tz.transition 2044, 3, :o2, 59224837, 24
-          tz.transition 2044, 10, :o1, 59230045, 24
-          tz.transition 2045, 3, :o2, 59233573, 24
-          tz.transition 2045, 10, :o1, 59238781, 24
-          tz.transition 2046, 3, :o2, 59242309, 24
-          tz.transition 2046, 10, :o1, 59247517, 24
-          tz.transition 2047, 3, :o2, 59251213, 24
-          tz.transition 2047, 10, :o1, 59256253, 24
-          tz.transition 2048, 3, :o2, 59259949, 24
-          tz.transition 2048, 10, :o1, 59264989, 24
-          tz.transition 2049, 3, :o2, 59268685, 24
-          tz.transition 2049, 10, :o1, 59273893, 24
-          tz.transition 2050, 3, :o2, 59277421, 24
-          tz.transition 2050, 10, :o1, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Vilnius.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Vilnius.rb
deleted file mode 100644
index d89d095a75..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Vilnius.rb
+++ /dev/null
@@ -1,170 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Vilnius
-        include TimezoneDefinition
-        
-        timezone 'Europe/Vilnius' do |tz|
-          tz.offset :o0, 6076, 0, :LMT
-          tz.offset :o1, 5040, 0, :WMT
-          tz.offset :o2, 5736, 0, :KMT
-          tz.offset :o3, 3600, 0, :CET
-          tz.offset :o4, 7200, 0, :EET
-          tz.offset :o5, 10800, 0, :MSK
-          tz.offset :o6, 3600, 3600, :CEST
-          tz.offset :o7, 10800, 3600, :MSD
-          tz.offset :o8, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 52006653281, 21600
-          tz.transition 1916, 12, :o2, 290547533, 120
-          tz.transition 1919, 10, :o3, 8720069161, 3600
-          tz.transition 1920, 7, :o4, 58140419, 24
-          tz.transition 1920, 10, :o3, 29071277, 12
-          tz.transition 1940, 8, :o5, 58316267, 24
-          tz.transition 1941, 6, :o6, 19441355, 8
-          tz.transition 1942, 11, :o3, 58335973, 24
-          tz.transition 1943, 3, :o6, 58339501, 24
-          tz.transition 1943, 10, :o3, 58344037, 24
-          tz.transition 1944, 4, :o6, 58348405, 24
-          tz.transition 1944, 7, :o5, 29175641, 12
-          tz.transition 1981, 3, :o7, 354920400
-          tz.transition 1981, 9, :o5, 370728000
-          tz.transition 1982, 3, :o7, 386456400
-          tz.transition 1982, 9, :o5, 402264000
-          tz.transition 1983, 3, :o7, 417992400
-          tz.transition 1983, 9, :o5, 433800000
-          tz.transition 1984, 3, :o7, 449614800
-          tz.transition 1984, 9, :o5, 465346800
-          tz.transition 1985, 3, :o7, 481071600
-          tz.transition 1985, 9, :o5, 496796400
-          tz.transition 1986, 3, :o7, 512521200
-          tz.transition 1986, 9, :o5, 528246000
-          tz.transition 1987, 3, :o7, 543970800
-          tz.transition 1987, 9, :o5, 559695600
-          tz.transition 1988, 3, :o7, 575420400
-          tz.transition 1988, 9, :o5, 591145200
-          tz.transition 1989, 3, :o7, 606870000
-          tz.transition 1989, 9, :o5, 622594800
-          tz.transition 1990, 3, :o7, 638319600
-          tz.transition 1990, 9, :o5, 654649200
-          tz.transition 1991, 3, :o8, 670374000
-          tz.transition 1991, 9, :o4, 686102400
-          tz.transition 1992, 3, :o8, 701827200
-          tz.transition 1992, 9, :o4, 717552000
-          tz.transition 1993, 3, :o8, 733276800
-          tz.transition 1993, 9, :o4, 749001600
-          tz.transition 1994, 3, :o8, 764726400
-          tz.transition 1994, 9, :o4, 780451200
-          tz.transition 1995, 3, :o8, 796176000
-          tz.transition 1995, 9, :o4, 811900800
-          tz.transition 1996, 3, :o8, 828230400
-          tz.transition 1996, 10, :o4, 846374400
-          tz.transition 1997, 3, :o8, 859680000
-          tz.transition 1997, 10, :o4, 877824000
-          tz.transition 1998, 3, :o6, 891133200
-          tz.transition 1998, 10, :o3, 909277200
-          tz.transition 1999, 3, :o6, 922582800
-          tz.transition 1999, 10, :o4, 941331600
-          tz.transition 2003, 3, :o8, 1048986000
-          tz.transition 2003, 10, :o4, 1067130000
-          tz.transition 2004, 3, :o8, 1080435600
-          tz.transition 2004, 10, :o4, 1099184400
-          tz.transition 2005, 3, :o8, 1111885200
-          tz.transition 2005, 10, :o4, 1130634000
-          tz.transition 2006, 3, :o8, 1143334800
-          tz.transition 2006, 10, :o4, 1162083600
-          tz.transition 2007, 3, :o8, 1174784400
-          tz.transition 2007, 10, :o4, 1193533200
-          tz.transition 2008, 3, :o8, 1206838800
-          tz.transition 2008, 10, :o4, 1224982800
-          tz.transition 2009, 3, :o8, 1238288400
-          tz.transition 2009, 10, :o4, 1256432400
-          tz.transition 2010, 3, :o8, 1269738000
-          tz.transition 2010, 10, :o4, 1288486800
-          tz.transition 2011, 3, :o8, 1301187600
-          tz.transition 2011, 10, :o4, 1319936400
-          tz.transition 2012, 3, :o8, 1332637200
-          tz.transition 2012, 10, :o4, 1351386000
-          tz.transition 2013, 3, :o8, 1364691600
-          tz.transition 2013, 10, :o4, 1382835600
-          tz.transition 2014, 3, :o8, 1396141200
-          tz.transition 2014, 10, :o4, 1414285200
-          tz.transition 2015, 3, :o8, 1427590800
-          tz.transition 2015, 10, :o4, 1445734800
-          tz.transition 2016, 3, :o8, 1459040400
-          tz.transition 2016, 10, :o4, 1477789200
-          tz.transition 2017, 3, :o8, 1490490000
-          tz.transition 2017, 10, :o4, 1509238800
-          tz.transition 2018, 3, :o8, 1521939600
-          tz.transition 2018, 10, :o4, 1540688400
-          tz.transition 2019, 3, :o8, 1553994000
-          tz.transition 2019, 10, :o4, 1572138000
-          tz.transition 2020, 3, :o8, 1585443600
-          tz.transition 2020, 10, :o4, 1603587600
-          tz.transition 2021, 3, :o8, 1616893200
-          tz.transition 2021, 10, :o4, 1635642000
-          tz.transition 2022, 3, :o8, 1648342800
-          tz.transition 2022, 10, :o4, 1667091600
-          tz.transition 2023, 3, :o8, 1679792400
-          tz.transition 2023, 10, :o4, 1698541200
-          tz.transition 2024, 3, :o8, 1711846800
-          tz.transition 2024, 10, :o4, 1729990800
-          tz.transition 2025, 3, :o8, 1743296400
-          tz.transition 2025, 10, :o4, 1761440400
-          tz.transition 2026, 3, :o8, 1774746000
-          tz.transition 2026, 10, :o4, 1792890000
-          tz.transition 2027, 3, :o8, 1806195600
-          tz.transition 2027, 10, :o4, 1824944400
-          tz.transition 2028, 3, :o8, 1837645200
-          tz.transition 2028, 10, :o4, 1856394000
-          tz.transition 2029, 3, :o8, 1869094800
-          tz.transition 2029, 10, :o4, 1887843600
-          tz.transition 2030, 3, :o8, 1901149200
-          tz.transition 2030, 10, :o4, 1919293200
-          tz.transition 2031, 3, :o8, 1932598800
-          tz.transition 2031, 10, :o4, 1950742800
-          tz.transition 2032, 3, :o8, 1964048400
-          tz.transition 2032, 10, :o4, 1982797200
-          tz.transition 2033, 3, :o8, 1995498000
-          tz.transition 2033, 10, :o4, 2014246800
-          tz.transition 2034, 3, :o8, 2026947600
-          tz.transition 2034, 10, :o4, 2045696400
-          tz.transition 2035, 3, :o8, 2058397200
-          tz.transition 2035, 10, :o4, 2077146000
-          tz.transition 2036, 3, :o8, 2090451600
-          tz.transition 2036, 10, :o4, 2108595600
-          tz.transition 2037, 3, :o8, 2121901200
-          tz.transition 2037, 10, :o4, 2140045200
-          tz.transition 2038, 3, :o8, 59172253, 24
-          tz.transition 2038, 10, :o4, 59177461, 24
-          tz.transition 2039, 3, :o8, 59180989, 24
-          tz.transition 2039, 10, :o4, 59186197, 24
-          tz.transition 2040, 3, :o8, 59189725, 24
-          tz.transition 2040, 10, :o4, 59194933, 24
-          tz.transition 2041, 3, :o8, 59198629, 24
-          tz.transition 2041, 10, :o4, 59203669, 24
-          tz.transition 2042, 3, :o8, 59207365, 24
-          tz.transition 2042, 10, :o4, 59212405, 24
-          tz.transition 2043, 3, :o8, 59216101, 24
-          tz.transition 2043, 10, :o4, 59221141, 24
-          tz.transition 2044, 3, :o8, 59224837, 24
-          tz.transition 2044, 10, :o4, 59230045, 24
-          tz.transition 2045, 3, :o8, 59233573, 24
-          tz.transition 2045, 10, :o4, 59238781, 24
-          tz.transition 2046, 3, :o8, 59242309, 24
-          tz.transition 2046, 10, :o4, 59247517, 24
-          tz.transition 2047, 3, :o8, 59251213, 24
-          tz.transition 2047, 10, :o4, 59256253, 24
-          tz.transition 2048, 3, :o8, 59259949, 24
-          tz.transition 2048, 10, :o4, 59264989, 24
-          tz.transition 2049, 3, :o8, 59268685, 24
-          tz.transition 2049, 10, :o4, 59273893, 24
-          tz.transition 2050, 3, :o8, 59277421, 24
-          tz.transition 2050, 10, :o4, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Warsaw.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Warsaw.rb
deleted file mode 100644
index 7fa51c2691..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Warsaw.rb
+++ /dev/null
@@ -1,212 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Warsaw
-        include TimezoneDefinition
-        
-        timezone 'Europe/Warsaw' do |tz|
-          tz.offset :o0, 5040, 0, :LMT
-          tz.offset :o1, 5040, 0, :WMT
-          tz.offset :o2, 3600, 0, :CET
-          tz.offset :o3, 3600, 3600, :CEST
-          tz.offset :o4, 7200, 0, :EET
-          tz.offset :o5, 7200, 3600, :EEST
-          
-          tz.transition 1879, 12, :o1, 288925853, 120
-          tz.transition 1915, 8, :o2, 290485733, 120
-          tz.transition 1916, 4, :o3, 29051813, 12
-          tz.transition 1916, 9, :o2, 58107299, 24
-          tz.transition 1917, 4, :o3, 58112029, 24
-          tz.transition 1917, 9, :o2, 58115725, 24
-          tz.transition 1918, 4, :o3, 58120765, 24
-          tz.transition 1918, 9, :o4, 58124461, 24
-          tz.transition 1919, 4, :o5, 4844127, 2
-          tz.transition 1919, 9, :o4, 4844435, 2
-          tz.transition 1922, 5, :o2, 29078477, 12
-          tz.transition 1940, 6, :o3, 58315285, 24
-          tz.transition 1942, 11, :o2, 58335973, 24
-          tz.transition 1943, 3, :o3, 58339501, 24
-          tz.transition 1943, 10, :o2, 58344037, 24
-          tz.transition 1944, 4, :o3, 58348405, 24
-          tz.transition 1944, 10, :o2, 4862735, 2
-          tz.transition 1945, 4, :o3, 58357787, 24
-          tz.transition 1945, 10, :o2, 29181125, 12
-          tz.transition 1946, 4, :o3, 58366187, 24
-          tz.transition 1946, 10, :o2, 58370413, 24
-          tz.transition 1947, 5, :o3, 58375429, 24
-          tz.transition 1947, 10, :o2, 58379125, 24
-          tz.transition 1948, 4, :o3, 58383829, 24
-          tz.transition 1948, 10, :o2, 58387861, 24
-          tz.transition 1949, 4, :o3, 58392397, 24
-          tz.transition 1949, 10, :o2, 58396597, 24
-          tz.transition 1957, 6, :o3, 4871983, 2
-          tz.transition 1957, 9, :o2, 4872221, 2
-          tz.transition 1958, 3, :o3, 4872585, 2
-          tz.transition 1958, 9, :o2, 4872949, 2
-          tz.transition 1959, 5, :o3, 4873439, 2
-          tz.transition 1959, 10, :o2, 4873691, 2
-          tz.transition 1960, 4, :o3, 4874055, 2
-          tz.transition 1960, 10, :o2, 4874419, 2
-          tz.transition 1961, 5, :o3, 4874895, 2
-          tz.transition 1961, 10, :o2, 4875147, 2
-          tz.transition 1962, 5, :o3, 4875623, 2
-          tz.transition 1962, 9, :o2, 4875875, 2
-          tz.transition 1963, 5, :o3, 4876351, 2
-          tz.transition 1963, 9, :o2, 4876603, 2
-          tz.transition 1964, 5, :o3, 4877093, 2
-          tz.transition 1964, 9, :o2, 4877331, 2
-          tz.transition 1977, 4, :o3, 228873600
-          tz.transition 1977, 9, :o2, 243993600
-          tz.transition 1978, 4, :o3, 260323200
-          tz.transition 1978, 10, :o2, 276048000
-          tz.transition 1979, 4, :o3, 291772800
-          tz.transition 1979, 9, :o2, 307497600
-          tz.transition 1980, 4, :o3, 323827200
-          tz.transition 1980, 9, :o2, 338947200
-          tz.transition 1981, 3, :o3, 354672000
-          tz.transition 1981, 9, :o2, 370396800
-          tz.transition 1982, 3, :o3, 386121600
-          tz.transition 1982, 9, :o2, 401846400
-          tz.transition 1983, 3, :o3, 417571200
-          tz.transition 1983, 9, :o2, 433296000
-          tz.transition 1984, 3, :o3, 449020800
-          tz.transition 1984, 9, :o2, 465350400
-          tz.transition 1985, 3, :o3, 481075200
-          tz.transition 1985, 9, :o2, 496800000
-          tz.transition 1986, 3, :o3, 512524800
-          tz.transition 1986, 9, :o2, 528249600
-          tz.transition 1987, 3, :o3, 543974400
-          tz.transition 1987, 9, :o2, 559699200
-          tz.transition 1988, 3, :o3, 575427600
-          tz.transition 1988, 9, :o2, 591152400
-          tz.transition 1989, 3, :o3, 606877200
-          tz.transition 1989, 9, :o2, 622602000
-          tz.transition 1990, 3, :o3, 638326800
-          tz.transition 1990, 9, :o2, 654656400
-          tz.transition 1991, 3, :o3, 670381200
-          tz.transition 1991, 9, :o2, 686106000
-          tz.transition 1992, 3, :o3, 701830800
-          tz.transition 1992, 9, :o2, 717555600
-          tz.transition 1993, 3, :o3, 733280400
-          tz.transition 1993, 9, :o2, 749005200
-          tz.transition 1994, 3, :o3, 764730000
-          tz.transition 1994, 9, :o2, 780454800
-          tz.transition 1995, 3, :o3, 796179600
-          tz.transition 1995, 9, :o2, 811904400
-          tz.transition 1996, 3, :o3, 828234000
-          tz.transition 1996, 10, :o2, 846378000
-          tz.transition 1997, 3, :o3, 859683600
-          tz.transition 1997, 10, :o2, 877827600
-          tz.transition 1998, 3, :o3, 891133200
-          tz.transition 1998, 10, :o2, 909277200
-          tz.transition 1999, 3, :o3, 922582800
-          tz.transition 1999, 10, :o2, 941331600
-          tz.transition 2000, 3, :o3, 954032400
-          tz.transition 2000, 10, :o2, 972781200
-          tz.transition 2001, 3, :o3, 985482000
-          tz.transition 2001, 10, :o2, 1004230800
-          tz.transition 2002, 3, :o3, 1017536400
-          tz.transition 2002, 10, :o2, 1035680400
-          tz.transition 2003, 3, :o3, 1048986000
-          tz.transition 2003, 10, :o2, 1067130000
-          tz.transition 2004, 3, :o3, 1080435600
-          tz.transition 2004, 10, :o2, 1099184400
-          tz.transition 2005, 3, :o3, 1111885200
-          tz.transition 2005, 10, :o2, 1130634000
-          tz.transition 2006, 3, :o3, 1143334800
-          tz.transition 2006, 10, :o2, 1162083600
-          tz.transition 2007, 3, :o3, 1174784400
-          tz.transition 2007, 10, :o2, 1193533200
-          tz.transition 2008, 3, :o3, 1206838800
-          tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
-          tz.transition 2010, 3, :o3, 1269738000
-          tz.transition 2010, 10, :o2, 1288486800
-          tz.transition 2011, 3, :o3, 1301187600
-          tz.transition 2011, 10, :o2, 1319936400
-          tz.transition 2012, 3, :o3, 1332637200
-          tz.transition 2012, 10, :o2, 1351386000
-          tz.transition 2013, 3, :o3, 1364691600
-          tz.transition 2013, 10, :o2, 1382835600
-          tz.transition 2014, 3, :o3, 1396141200
-          tz.transition 2014, 10, :o2, 1414285200
-          tz.transition 2015, 3, :o3, 1427590800
-          tz.transition 2015, 10, :o2, 1445734800
-          tz.transition 2016, 3, :o3, 1459040400
-          tz.transition 2016, 10, :o2, 1477789200
-          tz.transition 2017, 3, :o3, 1490490000
-          tz.transition 2017, 10, :o2, 1509238800
-          tz.transition 2018, 3, :o3, 1521939600
-          tz.transition 2018, 10, :o2, 1540688400
-          tz.transition 2019, 3, :o3, 1553994000
-          tz.transition 2019, 10, :o2, 1572138000
-          tz.transition 2020, 3, :o3, 1585443600
-          tz.transition 2020, 10, :o2, 1603587600
-          tz.transition 2021, 3, :o3, 1616893200
-          tz.transition 2021, 10, :o2, 1635642000
-          tz.transition 2022, 3, :o3, 1648342800
-          tz.transition 2022, 10, :o2, 1667091600
-          tz.transition 2023, 3, :o3, 1679792400
-          tz.transition 2023, 10, :o2, 1698541200
-          tz.transition 2024, 3, :o3, 1711846800
-          tz.transition 2024, 10, :o2, 1729990800
-          tz.transition 2025, 3, :o3, 1743296400
-          tz.transition 2025, 10, :o2, 1761440400
-          tz.transition 2026, 3, :o3, 1774746000
-          tz.transition 2026, 10, :o2, 1792890000
-          tz.transition 2027, 3, :o3, 1806195600
-          tz.transition 2027, 10, :o2, 1824944400
-          tz.transition 2028, 3, :o3, 1837645200
-          tz.transition 2028, 10, :o2, 1856394000
-          tz.transition 2029, 3, :o3, 1869094800
-          tz.transition 2029, 10, :o2, 1887843600
-          tz.transition 2030, 3, :o3, 1901149200
-          tz.transition 2030, 10, :o2, 1919293200
-          tz.transition 2031, 3, :o3, 1932598800
-          tz.transition 2031, 10, :o2, 1950742800
-          tz.transition 2032, 3, :o3, 1964048400
-          tz.transition 2032, 10, :o2, 1982797200
-          tz.transition 2033, 3, :o3, 1995498000
-          tz.transition 2033, 10, :o2, 2014246800
-          tz.transition 2034, 3, :o3, 2026947600
-          tz.transition 2034, 10, :o2, 2045696400
-          tz.transition 2035, 3, :o3, 2058397200
-          tz.transition 2035, 10, :o2, 2077146000
-          tz.transition 2036, 3, :o3, 2090451600
-          tz.transition 2036, 10, :o2, 2108595600
-          tz.transition 2037, 3, :o3, 2121901200
-          tz.transition 2037, 10, :o2, 2140045200
-          tz.transition 2038, 3, :o3, 59172253, 24
-          tz.transition 2038, 10, :o2, 59177461, 24
-          tz.transition 2039, 3, :o3, 59180989, 24
-          tz.transition 2039, 10, :o2, 59186197, 24
-          tz.transition 2040, 3, :o3, 59189725, 24
-          tz.transition 2040, 10, :o2, 59194933, 24
-          tz.transition 2041, 3, :o3, 59198629, 24
-          tz.transition 2041, 10, :o2, 59203669, 24
-          tz.transition 2042, 3, :o3, 59207365, 24
-          tz.transition 2042, 10, :o2, 59212405, 24
-          tz.transition 2043, 3, :o3, 59216101, 24
-          tz.transition 2043, 10, :o2, 59221141, 24
-          tz.transition 2044, 3, :o3, 59224837, 24
-          tz.transition 2044, 10, :o2, 59230045, 24
-          tz.transition 2045, 3, :o3, 59233573, 24
-          tz.transition 2045, 10, :o2, 59238781, 24
-          tz.transition 2046, 3, :o3, 59242309, 24
-          tz.transition 2046, 10, :o2, 59247517, 24
-          tz.transition 2047, 3, :o3, 59251213, 24
-          tz.transition 2047, 10, :o2, 59256253, 24
-          tz.transition 2048, 3, :o3, 59259949, 24
-          tz.transition 2048, 10, :o2, 59264989, 24
-          tz.transition 2049, 3, :o3, 59268685, 24
-          tz.transition 2049, 10, :o2, 59273893, 24
-          tz.transition 2050, 3, :o3, 59277421, 24
-          tz.transition 2050, 10, :o2, 59282629, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Zagreb.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Zagreb.rb
deleted file mode 100644
index ecdd903d28..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Zagreb.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Europe
-      module Zagreb
-        include TimezoneDefinition
-        
-        linked_timezone 'Europe/Zagreb', 'Europe/Belgrade'
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Auckland.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Auckland.rb
deleted file mode 100644
index a524fd6b6b..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Auckland.rb
+++ /dev/null
@@ -1,202 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Auckland
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Auckland' do |tz|
-          tz.offset :o0, 41944, 0, :LMT
-          tz.offset :o1, 41400, 0, :NZMT
-          tz.offset :o2, 41400, 3600, :NZST
-          tz.offset :o3, 41400, 1800, :NZST
-          tz.offset :o4, 43200, 0, :NZST
-          tz.offset :o5, 43200, 3600, :NZDT
-          
-          tz.transition 1868, 11, :o1, 25959290557, 10800
-          tz.transition 1927, 11, :o2, 116409125, 48
-          tz.transition 1928, 3, :o1, 38804945, 16
-          tz.transition 1928, 10, :o3, 116425589, 48
-          tz.transition 1929, 3, :o1, 29108245, 12
-          tz.transition 1929, 10, :o3, 116443061, 48
-          tz.transition 1930, 3, :o1, 29112613, 12
-          tz.transition 1930, 10, :o3, 116460533, 48
-          tz.transition 1931, 3, :o1, 29116981, 12
-          tz.transition 1931, 10, :o3, 116478005, 48
-          tz.transition 1932, 3, :o1, 29121433, 12
-          tz.transition 1932, 10, :o3, 116495477, 48
-          tz.transition 1933, 3, :o1, 29125801, 12
-          tz.transition 1933, 10, :o3, 116512949, 48
-          tz.transition 1934, 4, :o1, 29130673, 12
-          tz.transition 1934, 9, :o3, 116530085, 48
-          tz.transition 1935, 4, :o1, 29135041, 12
-          tz.transition 1935, 9, :o3, 116547557, 48
-          tz.transition 1936, 4, :o1, 29139409, 12
-          tz.transition 1936, 9, :o3, 116565029, 48
-          tz.transition 1937, 4, :o1, 29143777, 12
-          tz.transition 1937, 9, :o3, 116582501, 48
-          tz.transition 1938, 4, :o1, 29148145, 12
-          tz.transition 1938, 9, :o3, 116599973, 48
-          tz.transition 1939, 4, :o1, 29152597, 12
-          tz.transition 1939, 9, :o3, 116617445, 48
-          tz.transition 1940, 4, :o1, 29156965, 12
-          tz.transition 1940, 9, :o3, 116635253, 48
-          tz.transition 1945, 12, :o4, 2431821, 1
-          tz.transition 1974, 11, :o5, 152632800
-          tz.transition 1975, 2, :o4, 162309600
-          tz.transition 1975, 10, :o5, 183477600
-          tz.transition 1976, 3, :o4, 194968800
-          tz.transition 1976, 10, :o5, 215532000
-          tz.transition 1977, 3, :o4, 226418400
-          tz.transition 1977, 10, :o5, 246981600
-          tz.transition 1978, 3, :o4, 257868000
-          tz.transition 1978, 10, :o5, 278431200
-          tz.transition 1979, 3, :o4, 289317600
-          tz.transition 1979, 10, :o5, 309880800
-          tz.transition 1980, 3, :o4, 320767200
-          tz.transition 1980, 10, :o5, 341330400
-          tz.transition 1981, 2, :o4, 352216800
-          tz.transition 1981, 10, :o5, 372780000
-          tz.transition 1982, 3, :o4, 384271200
-          tz.transition 1982, 10, :o5, 404834400
-          tz.transition 1983, 3, :o4, 415720800
-          tz.transition 1983, 10, :o5, 436284000
-          tz.transition 1984, 3, :o4, 447170400
-          tz.transition 1984, 10, :o5, 467733600
-          tz.transition 1985, 3, :o4, 478620000
-          tz.transition 1985, 10, :o5, 499183200
-          tz.transition 1986, 3, :o4, 510069600
-          tz.transition 1986, 10, :o5, 530632800
-          tz.transition 1987, 2, :o4, 541519200
-          tz.transition 1987, 10, :o5, 562082400
-          tz.transition 1988, 3, :o4, 573573600
-          tz.transition 1988, 10, :o5, 594136800
-          tz.transition 1989, 3, :o4, 605023200
-          tz.transition 1989, 10, :o5, 623772000
-          tz.transition 1990, 3, :o4, 637682400
-          tz.transition 1990, 10, :o5, 655221600
-          tz.transition 1991, 3, :o4, 669132000
-          tz.transition 1991, 10, :o5, 686671200
-          tz.transition 1992, 3, :o4, 700581600
-          tz.transition 1992, 10, :o5, 718120800
-          tz.transition 1993, 3, :o4, 732636000
-          tz.transition 1993, 10, :o5, 749570400
-          tz.transition 1994, 3, :o4, 764085600
-          tz.transition 1994, 10, :o5, 781020000
-          tz.transition 1995, 3, :o4, 795535200
-          tz.transition 1995, 9, :o5, 812469600
-          tz.transition 1996, 3, :o4, 826984800
-          tz.transition 1996, 10, :o5, 844524000
-          tz.transition 1997, 3, :o4, 858434400
-          tz.transition 1997, 10, :o5, 875973600
-          tz.transition 1998, 3, :o4, 889884000
-          tz.transition 1998, 10, :o5, 907423200
-          tz.transition 1999, 3, :o4, 921938400
-          tz.transition 1999, 10, :o5, 938872800
-          tz.transition 2000, 3, :o4, 953388000
-          tz.transition 2000, 9, :o5, 970322400
-          tz.transition 2001, 3, :o4, 984837600
-          tz.transition 2001, 10, :o5, 1002376800
-          tz.transition 2002, 3, :o4, 1016287200
-          tz.transition 2002, 10, :o5, 1033826400
-          tz.transition 2003, 3, :o4, 1047736800
-          tz.transition 2003, 10, :o5, 1065276000
-          tz.transition 2004, 3, :o4, 1079791200
-          tz.transition 2004, 10, :o5, 1096725600
-          tz.transition 2005, 3, :o4, 1111240800
-          tz.transition 2005, 10, :o5, 1128175200
-          tz.transition 2006, 3, :o4, 1142690400
-          tz.transition 2006, 9, :o5, 1159624800
-          tz.transition 2007, 3, :o4, 1174140000
-          tz.transition 2007, 9, :o5, 1191074400
-          tz.transition 2008, 4, :o4, 1207404000
-          tz.transition 2008, 9, :o5, 1222524000
-          tz.transition 2009, 4, :o4, 1238853600
-          tz.transition 2009, 9, :o5, 1253973600
-          tz.transition 2010, 4, :o4, 1270303200
-          tz.transition 2010, 9, :o5, 1285423200
-          tz.transition 2011, 4, :o4, 1301752800
-          tz.transition 2011, 9, :o5, 1316872800
-          tz.transition 2012, 3, :o4, 1333202400
-          tz.transition 2012, 9, :o5, 1348927200
-          tz.transition 2013, 4, :o4, 1365256800
-          tz.transition 2013, 9, :o5, 1380376800
-          tz.transition 2014, 4, :o4, 1396706400
-          tz.transition 2014, 9, :o5, 1411826400
-          tz.transition 2015, 4, :o4, 1428156000
-          tz.transition 2015, 9, :o5, 1443276000
-          tz.transition 2016, 4, :o4, 1459605600
-          tz.transition 2016, 9, :o5, 1474725600
-          tz.transition 2017, 4, :o4, 1491055200
-          tz.transition 2017, 9, :o5, 1506175200
-          tz.transition 2018, 3, :o4, 1522504800
-          tz.transition 2018, 9, :o5, 1538229600
-          tz.transition 2019, 4, :o4, 1554559200
-          tz.transition 2019, 9, :o5, 1569679200
-          tz.transition 2020, 4, :o4, 1586008800
-          tz.transition 2020, 9, :o5, 1601128800
-          tz.transition 2021, 4, :o4, 1617458400
-          tz.transition 2021, 9, :o5, 1632578400
-          tz.transition 2022, 4, :o4, 1648908000
-          tz.transition 2022, 9, :o5, 1664028000
-          tz.transition 2023, 4, :o4, 1680357600
-          tz.transition 2023, 9, :o5, 1695477600
-          tz.transition 2024, 4, :o4, 1712412000
-          tz.transition 2024, 9, :o5, 1727532000
-          tz.transition 2025, 4, :o4, 1743861600
-          tz.transition 2025, 9, :o5, 1758981600
-          tz.transition 2026, 4, :o4, 1775311200
-          tz.transition 2026, 9, :o5, 1790431200
-          tz.transition 2027, 4, :o4, 1806760800
-          tz.transition 2027, 9, :o5, 1821880800
-          tz.transition 2028, 4, :o4, 1838210400
-          tz.transition 2028, 9, :o5, 1853330400
-          tz.transition 2029, 3, :o4, 1869660000
-          tz.transition 2029, 9, :o5, 1885384800
-          tz.transition 2030, 4, :o4, 1901714400
-          tz.transition 2030, 9, :o5, 1916834400
-          tz.transition 2031, 4, :o4, 1933164000
-          tz.transition 2031, 9, :o5, 1948284000
-          tz.transition 2032, 4, :o4, 1964613600
-          tz.transition 2032, 9, :o5, 1979733600
-          tz.transition 2033, 4, :o4, 1996063200
-          tz.transition 2033, 9, :o5, 2011183200
-          tz.transition 2034, 4, :o4, 2027512800
-          tz.transition 2034, 9, :o5, 2042632800
-          tz.transition 2035, 3, :o4, 2058962400
-          tz.transition 2035, 9, :o5, 2074687200
-          tz.transition 2036, 4, :o4, 2091016800
-          tz.transition 2036, 9, :o5, 2106136800
-          tz.transition 2037, 4, :o4, 2122466400
-          tz.transition 2037, 9, :o5, 2137586400
-          tz.transition 2038, 4, :o4, 29586205, 12
-          tz.transition 2038, 9, :o5, 29588305, 12
-          tz.transition 2039, 4, :o4, 29590573, 12
-          tz.transition 2039, 9, :o5, 29592673, 12
-          tz.transition 2040, 3, :o4, 29594941, 12
-          tz.transition 2040, 9, :o5, 29597125, 12
-          tz.transition 2041, 4, :o4, 29599393, 12
-          tz.transition 2041, 9, :o5, 29601493, 12
-          tz.transition 2042, 4, :o4, 29603761, 12
-          tz.transition 2042, 9, :o5, 29605861, 12
-          tz.transition 2043, 4, :o4, 29608129, 12
-          tz.transition 2043, 9, :o5, 29610229, 12
-          tz.transition 2044, 4, :o4, 29612497, 12
-          tz.transition 2044, 9, :o5, 29614597, 12
-          tz.transition 2045, 4, :o4, 29616865, 12
-          tz.transition 2045, 9, :o5, 29618965, 12
-          tz.transition 2046, 3, :o4, 29621233, 12
-          tz.transition 2046, 9, :o5, 29623417, 12
-          tz.transition 2047, 4, :o4, 29625685, 12
-          tz.transition 2047, 9, :o5, 29627785, 12
-          tz.transition 2048, 4, :o4, 29630053, 12
-          tz.transition 2048, 9, :o5, 29632153, 12
-          tz.transition 2049, 4, :o4, 29634421, 12
-          tz.transition 2049, 9, :o5, 29636521, 12
-          tz.transition 2050, 4, :o4, 29638789, 12
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Fiji.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Fiji.rb
deleted file mode 100644
index 5fe9bbd9a6..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Fiji.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Fiji
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Fiji' do |tz|
-          tz.offset :o0, 42820, 0, :LMT
-          tz.offset :o1, 43200, 0, :FJT
-          tz.offset :o2, 43200, 3600, :FJST
-          
-          tz.transition 1915, 10, :o1, 10457838739, 4320
-          tz.transition 1998, 10, :o2, 909842400
-          tz.transition 1999, 2, :o1, 920124000
-          tz.transition 1999, 11, :o2, 941896800
-          tz.transition 2000, 2, :o1, 951573600
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Guam.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Guam.rb
deleted file mode 100644
index d4c1a0a682..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Guam.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Guam
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Guam' do |tz|
-          tz.offset :o0, -51660, 0, :LMT
-          tz.offset :o1, 34740, 0, :LMT
-          tz.offset :o2, 36000, 0, :GST
-          tz.offset :o3, 36000, 0, :ChST
-          
-          tz.transition 1844, 12, :o1, 1149567407, 480
-          tz.transition 1900, 12, :o2, 1159384847, 480
-          tz.transition 2000, 12, :o3, 977493600
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Honolulu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Honolulu.rb
deleted file mode 100644
index 204b226537..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Honolulu.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Honolulu
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Honolulu' do |tz|
-          tz.offset :o0, -37886, 0, :LMT
-          tz.offset :o1, -37800, 0, :HST
-          tz.offset :o2, -37800, 3600, :HDT
-          tz.offset :o3, -37800, 3600, :HWT
-          tz.offset :o4, -37800, 3600, :HPT
-          tz.offset :o5, -36000, 0, :HST
-          
-          tz.transition 1900, 1, :o1, 104328926143, 43200
-          tz.transition 1933, 4, :o2, 116505265, 48
-          tz.transition 1933, 5, :o1, 116506271, 48
-          tz.transition 1942, 2, :o3, 116659201, 48
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 116722991, 48
-          tz.transition 1947, 6, :o5, 116752561, 48
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Majuro.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Majuro.rb
deleted file mode 100644
index 32adad92c1..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Majuro.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Majuro
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Majuro' do |tz|
-          tz.offset :o0, 41088, 0, :LMT
-          tz.offset :o1, 39600, 0, :MHT
-          tz.offset :o2, 43200, 0, :MHT
-          
-          tz.transition 1900, 12, :o1, 1086923261, 450
-          tz.transition 1969, 9, :o2, 58571881, 24
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Midway.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Midway.rb
deleted file mode 100644
index 97784fcc10..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Midway.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Midway
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Midway' do |tz|
-          tz.offset :o0, -42568, 0, :LMT
-          tz.offset :o1, -39600, 0, :NST
-          tz.offset :o2, -39600, 3600, :NDT
-          tz.offset :o3, -39600, 0, :BST
-          tz.offset :o4, -39600, 0, :SST
-          
-          tz.transition 1901, 1, :o1, 26086168721, 10800
-          tz.transition 1956, 6, :o2, 58455071, 24
-          tz.transition 1956, 9, :o1, 29228627, 12
-          tz.transition 1967, 4, :o3, 58549967, 24
-          tz.transition 1983, 11, :o4, 439038000
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Noumea.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Noumea.rb
deleted file mode 100644
index 70173db8ab..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Noumea.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Noumea
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Noumea' do |tz|
-          tz.offset :o0, 39948, 0, :LMT
-          tz.offset :o1, 39600, 0, :NCT
-          tz.offset :o2, 39600, 3600, :NCST
-          
-          tz.transition 1912, 1, :o1, 17419781071, 7200
-          tz.transition 1977, 12, :o2, 250002000
-          tz.transition 1978, 2, :o1, 257342400
-          tz.transition 1978, 12, :o2, 281451600
-          tz.transition 1979, 2, :o1, 288878400
-          tz.transition 1996, 11, :o2, 849366000
-          tz.transition 1997, 3, :o1, 857228400
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Pago_Pago.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Pago_Pago.rb
deleted file mode 100644
index c8fcd7d527..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Pago_Pago.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Pago_Pago
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Pago_Pago' do |tz|
-          tz.offset :o0, 45432, 0, :LMT
-          tz.offset :o1, -40968, 0, :LMT
-          tz.offset :o2, -41400, 0, :SAMT
-          tz.offset :o3, -39600, 0, :NST
-          tz.offset :o4, -39600, 0, :BST
-          tz.offset :o5, -39600, 0, :SST
-          
-          tz.transition 1879, 7, :o1, 2889041969, 1200
-          tz.transition 1911, 1, :o2, 2902845569, 1200
-          tz.transition 1950, 1, :o3, 116797583, 48
-          tz.transition 1967, 4, :o4, 58549967, 24
-          tz.transition 1983, 11, :o5, 439038000
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Port_Moresby.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Port_Moresby.rb
deleted file mode 100644
index f06cf6d54f..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Port_Moresby.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Port_Moresby
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Port_Moresby' do |tz|
-          tz.offset :o0, 35320, 0, :LMT
-          tz.offset :o1, 35312, 0, :PMMT
-          tz.offset :o2, 36000, 0, :PGT
-          
-          tz.transition 1879, 12, :o1, 5200664597, 2160
-          tz.transition 1894, 12, :o2, 13031248093, 5400
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Tongatapu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Tongatapu.rb
deleted file mode 100644
index 7578d92f38..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Tongatapu.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'tzinfo/timezone_definition'
-
-module TZInfo
-  module Definitions
-    module Pacific
-      module Tongatapu
-        include TimezoneDefinition
-        
-        timezone 'Pacific/Tongatapu' do |tz|
-          tz.offset :o0, 44360, 0, :LMT
-          tz.offset :o1, 44400, 0, :TOT
-          tz.offset :o2, 46800, 0, :TOT
-          tz.offset :o3, 46800, 3600, :TOST
-          
-          tz.transition 1900, 12, :o1, 5217231571, 2160
-          tz.transition 1940, 12, :o2, 174959639, 72
-          tz.transition 1999, 10, :o3, 939214800
-          tz.transition 2000, 3, :o2, 953384400
-          tz.transition 2000, 11, :o3, 973342800
-          tz.transition 2001, 1, :o2, 980596800
-          tz.transition 2001, 11, :o3, 1004792400
-          tz.transition 2002, 1, :o2, 1012046400
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/info_timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/info_timezone.rb
deleted file mode 100644
index 001303c594..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/info_timezone.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/timezone'
-
-module TZInfo
-
-  # A Timezone based on a TimezoneInfo.
-  class InfoTimezone < Timezone #:nodoc:
-    
-    # Constructs a new InfoTimezone with a TimezoneInfo instance.
-    def self.new(info)      
-      tz = super()
-      tz.send(:setup, info)
-      tz
-    end
-    
-    # The identifier of the timezone, e.g. "Europe/Paris".
-    def identifier
-      @info.identifier
-    end
-    
-    protected
-      # The TimezoneInfo for this Timezone.
-      def info
-        @info
-      end
-          
-      def setup(info)
-        @info = info
-      end
-  end    
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/linked_timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/linked_timezone.rb
deleted file mode 100644
index f8ec4fca87..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/linked_timezone.rb
+++ /dev/null
@@ -1,51 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/info_timezone'
-
-module TZInfo
-
-  class LinkedTimezone < InfoTimezone #:nodoc:
-    # Returns the TimezonePeriod for the given UTC time. utc can either be
-    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
-    # information in utc is ignored (it is treated as a UTC time).        
-    #
-    # If no TimezonePeriod could be found, PeriodNotFound is raised.
-    def period_for_utc(utc)
-      @linked_timezone.period_for_utc(utc)
-    end
-    
-    # Returns the set of TimezonePeriod instances that are valid for the given
-    # local time as an array. If you just want a single period, use 
-    # period_for_local instead and specify how abiguities should be resolved.
-    # Raises PeriodNotFound if no periods are found for the given time.
-    def periods_for_local(local)
-      @linked_timezone.periods_for_local(local)
-    end
-    
-    protected
-      def setup(info)
-        super(info)
-        @linked_timezone = Timezone.get(info.link_to_identifier)
-      end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/linked_timezone_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/linked_timezone_info.rb
deleted file mode 100644
index 8197ff3e81..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/linked_timezone_info.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/timezone_info'
-
-module TZInfo
-  # Represents a linked timezone defined in a data module.
-  class LinkedTimezoneInfo < TimezoneInfo #:nodoc:
-        
-    # The zone that provides the data (that this zone is an alias for).
-    attr_reader :link_to_identifier
-    
-    # Constructs a new TimezoneInfo with an identifier and the identifier
-    # of the zone linked to.
-    def initialize(identifier, link_to_identifier)
-      super(identifier)
-      @link_to_identifier = link_to_identifier      
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #@identifier,#@link_to_identifier>"
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/offset_rationals.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/offset_rationals.rb
deleted file mode 100644
index b1f10b2b63..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/offset_rationals.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'rational'
-require 'tzinfo/ruby_core_support'
-
-module TZInfo
-  
-  # Provides a method for getting Rationals for a timezone offset in seconds.
-  # Pre-reduced rationals are returned for all the half-hour intervals between
-  # -14 and +14 hours to avoid having to call gcd at runtime.  
-  module OffsetRationals #:nodoc:
-    @@rational_cache = {
-      -50400 => RubyCoreSupport.rational_new!(-7,12), 
-      -48600 => RubyCoreSupport.rational_new!(-9,16),
-      -46800 => RubyCoreSupport.rational_new!(-13,24),
-      -45000 => RubyCoreSupport.rational_new!(-25,48),
-      -43200 => RubyCoreSupport.rational_new!(-1,2),
-      -41400 => RubyCoreSupport.rational_new!(-23,48),
-      -39600 => RubyCoreSupport.rational_new!(-11,24),
-      -37800 => RubyCoreSupport.rational_new!(-7,16),
-      -36000 => RubyCoreSupport.rational_new!(-5,12),
-      -34200 => RubyCoreSupport.rational_new!(-19,48),
-      -32400 => RubyCoreSupport.rational_new!(-3,8),
-      -30600 => RubyCoreSupport.rational_new!(-17,48),
-      -28800 => RubyCoreSupport.rational_new!(-1,3),
-      -27000 => RubyCoreSupport.rational_new!(-5,16),
-      -25200 => RubyCoreSupport.rational_new!(-7,24),
-      -23400 => RubyCoreSupport.rational_new!(-13,48),
-      -21600 => RubyCoreSupport.rational_new!(-1,4),
-      -19800 => RubyCoreSupport.rational_new!(-11,48),
-      -18000 => RubyCoreSupport.rational_new!(-5,24),
-      -16200 => RubyCoreSupport.rational_new!(-3,16),
-      -14400 => RubyCoreSupport.rational_new!(-1,6),
-      -12600 => RubyCoreSupport.rational_new!(-7,48),
-      -10800 => RubyCoreSupport.rational_new!(-1,8),
-       -9000 => RubyCoreSupport.rational_new!(-5,48),
-       -7200 => RubyCoreSupport.rational_new!(-1,12),
-       -5400 => RubyCoreSupport.rational_new!(-1,16),
-       -3600 => RubyCoreSupport.rational_new!(-1,24),
-       -1800 => RubyCoreSupport.rational_new!(-1,48),
-           0 => RubyCoreSupport.rational_new!(0,1),
-        1800 => RubyCoreSupport.rational_new!(1,48),
-        3600 => RubyCoreSupport.rational_new!(1,24),
-        5400 => RubyCoreSupport.rational_new!(1,16),
-        7200 => RubyCoreSupport.rational_new!(1,12),
-        9000 => RubyCoreSupport.rational_new!(5,48),
-       10800 => RubyCoreSupport.rational_new!(1,8),
-       12600 => RubyCoreSupport.rational_new!(7,48),
-       14400 => RubyCoreSupport.rational_new!(1,6),
-       16200 => RubyCoreSupport.rational_new!(3,16),
-       18000 => RubyCoreSupport.rational_new!(5,24),
-       19800 => RubyCoreSupport.rational_new!(11,48),
-       21600 => RubyCoreSupport.rational_new!(1,4),
-       23400 => RubyCoreSupport.rational_new!(13,48),
-       25200 => RubyCoreSupport.rational_new!(7,24),
-       27000 => RubyCoreSupport.rational_new!(5,16),
-       28800 => RubyCoreSupport.rational_new!(1,3),
-       30600 => RubyCoreSupport.rational_new!(17,48),
-       32400 => RubyCoreSupport.rational_new!(3,8),
-       34200 => RubyCoreSupport.rational_new!(19,48),
-       36000 => RubyCoreSupport.rational_new!(5,12),
-       37800 => RubyCoreSupport.rational_new!(7,16),
-       39600 => RubyCoreSupport.rational_new!(11,24),
-       41400 => RubyCoreSupport.rational_new!(23,48),
-       43200 => RubyCoreSupport.rational_new!(1,2),
-       45000 => RubyCoreSupport.rational_new!(25,48),
-       46800 => RubyCoreSupport.rational_new!(13,24),
-       48600 => RubyCoreSupport.rational_new!(9,16),
-       50400 => RubyCoreSupport.rational_new!(7,12)}
-    
-    # Returns a Rational expressing the fraction of a day that offset in 
-    # seconds represents (i.e. equivalent to Rational(offset, 86400)). 
-    def rational_for_offset(offset)
-      @@rational_cache[offset] || Rational(offset, 86400)      
-    end
-    module_function :rational_for_offset
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/ruby_core_support.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/ruby_core_support.rb
deleted file mode 100644
index 9a0441206b..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/ruby_core_support.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#--

-# Copyright (c) 2008 Philip Ross

-# 

-# Permission is hereby granted, free of charge, to any person obtaining a copy

-# of this software and associated documentation files (the "Software"), to deal

-# in the Software without restriction, including without limitation the rights

-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-# copies of the Software, and to permit persons to whom the Software is

-# furnished to do so, subject to the following conditions:

-# 

-# The above copyright notice and this permission notice shall be included in all

-# copies or substantial portions of the Software.

-#

-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-# THE SOFTWARE.

-#++

-

-require 'date'

-require 'rational'

-

-module TZInfo

-  

-  # Methods to support different versions of Ruby.

-  module RubyCoreSupport #:nodoc:

-  

-    # Use Rational.new! for performance reasons in Ruby 1.8.

-    # This has been removed from 1.9, but Rational performs better.        

-    if Rational.respond_to? :new!

-      def self.rational_new!(numerator, denominator = 1)

-        Rational.new!(numerator, denominator)

-      end

-    else

-      def self.rational_new!(numerator, denominator = 1)

-        Rational(numerator, denominator)

-      end

-    end

-    

-    # Ruby 1.8.6 introduced new! and deprecated new0.

-    # Ruby 1.9.0 removed new0.

-    # We still need to support new0 for older versions of Ruby.

-    if DateTime.respond_to? :new!

-      def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)

-        DateTime.new!(ajd, of, sg)

-      end

-    else

-      def self.datetime_new!(ajd = 0, of = 0, sg = Date::ITALY)

-        DateTime.new0(ajd, of, sg)

-      end

-    end

-  end

-end
\ No newline at end of file
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/time_or_datetime.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/time_or_datetime.rb
deleted file mode 100644
index 264517f3ee..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/time_or_datetime.rb
+++ /dev/null
@@ -1,292 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'date'
-require 'time'
-require 'tzinfo/offset_rationals'
-
-module TZInfo
-  # Used by TZInfo internally to represent either a Time, DateTime or integer
-  # timestamp (seconds since 1970-01-01 00:00:00).
-  class TimeOrDateTime #:nodoc:
-    include Comparable
-    
-    # Constructs a new TimeOrDateTime. timeOrDateTime can be a Time, DateTime
-    # or an integer. If using a Time or DateTime, any time zone information is 
-    # ignored.
-    def initialize(timeOrDateTime)
-      @time = nil
-      @datetime = nil
-      @timestamp = nil
-      
-      if timeOrDateTime.is_a?(Time)
-        @time = timeOrDateTime        
-        @time = Time.utc(@time.year, @time.mon, @time.mday, @time.hour, @time.min, @time.sec) unless @time.zone == 'UTC'        
-        @orig = @time
-      elsif timeOrDateTime.is_a?(DateTime)
-        @datetime = timeOrDateTime
-        @datetime = @datetime.new_offset(0) unless @datetime.offset == 0
-        @orig = @datetime
-      else
-        @timestamp = timeOrDateTime.to_i
-        @orig = @timestamp
-      end
-    end
-    
-    # Returns the time as a Time.
-    def to_time
-      unless @time        
-        if @timestamp 
-          @time = Time.at(@timestamp).utc
-        else
-          @time = Time.utc(year, mon, mday, hour, min, sec)
-        end
-      end
-      
-      @time      
-    end
-    
-    # Returns the time as a DateTime.
-    def to_datetime
-      unless @datetime
-        @datetime = DateTime.new(year, mon, mday, hour, min, sec)
-      end
-      
-      @datetime
-    end
-    
-    # Returns the time as an integer timestamp.
-    def to_i
-      unless @timestamp
-        @timestamp = to_time.to_i
-      end
-      
-      @timestamp
-    end
-    
-    # Returns the time as the original time passed to new.
-    def to_orig
-      @orig
-    end
-    
-    # Returns a string representation of the TimeOrDateTime.
-    def to_s
-      if @orig.is_a?(Time)
-        "Time: #{@orig.to_s}"
-      elsif @orig.is_a?(DateTime)
-        "DateTime: #{@orig.to_s}"
-      else
-        "Timestamp: #{@orig.to_s}"
-      end
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #{@orig.inspect}>"
-    end
-    
-    # Returns the year.
-    def year
-      if @time
-        @time.year
-      elsif @datetime
-        @datetime.year
-      else
-        to_time.year
-      end
-    end
-    
-    # Returns the month of the year (1..12).
-    def mon
-      if @time
-        @time.mon
-      elsif @datetime
-        @datetime.mon
-      else
-        to_time.mon
-      end
-    end
-    alias :month :mon
-    
-    # Returns the day of the month (1..n).
-    def mday
-      if @time
-        @time.mday
-      elsif @datetime
-        @datetime.mday
-      else
-        to_time.mday
-      end
-    end
-    alias :day :mday
-    
-    # Returns the hour of the day (0..23).
-    def hour
-      if @time
-        @time.hour
-      elsif @datetime
-        @datetime.hour
-      else
-        to_time.hour
-      end
-    end
-    
-    # Returns the minute of the hour (0..59).
-    def min
-      if @time
-        @time.min
-      elsif @datetime
-        @datetime.min
-      else
-        to_time.min
-      end
-    end
-    
-    # Returns the second of the minute (0..60). (60 for a leap second).
-    def sec
-      if @time
-        @time.sec
-      elsif @datetime
-        @datetime.sec
-      else
-        to_time.sec
-      end
-    end
-    
-    # Compares this TimeOrDateTime with another Time, DateTime, integer
-    # timestamp or TimeOrDateTime. Returns -1, 0 or +1 depending whether the 
-    # receiver is less than, equal to, or greater than timeOrDateTime.
-    #
-    # Milliseconds and smaller units are ignored in the comparison.
-    def <=>(timeOrDateTime)
-      if timeOrDateTime.is_a?(TimeOrDateTime)            
-        orig = timeOrDateTime.to_orig
-        
-        if @orig.is_a?(DateTime) || orig.is_a?(DateTime)
-          # If either is a DateTime, assume it is there for a reason 
-          # (i.e. for range).
-          to_datetime <=> timeOrDateTime.to_datetime
-        elsif orig.is_a?(Time)
-          to_time <=> timeOrDateTime.to_time
-        else
-          to_i <=> timeOrDateTime.to_i
-        end        
-      elsif @orig.is_a?(DateTime) || timeOrDateTime.is_a?(DateTime)
-        # If either is a DateTime, assume it is there for a reason 
-        # (i.e. for range).        
-        to_datetime <=> TimeOrDateTime.wrap(timeOrDateTime).to_datetime
-      elsif timeOrDateTime.is_a?(Time)
-        to_time <=> timeOrDateTime
-      else
-        to_i <=> timeOrDateTime.to_i
-      end
-    end
-    
-    # Adds a number of seconds to the TimeOrDateTime. Returns a new 
-    # TimeOrDateTime, preserving what the original constructed type was.
-    # If the original type is a Time and the resulting calculation goes out of
-    # range for Times, then an exception will be raised by the Time class.
-    def +(seconds)
-      if seconds == 0
-        self
-      else
-        if @orig.is_a?(DateTime)
-          TimeOrDateTime.new(@orig + OffsetRationals.rational_for_offset(seconds))
-        else
-          # + defined for Time and integer timestamps
-          TimeOrDateTime.new(@orig + seconds)
-        end
-      end
-    end
-    
-    # Subtracts a number of seconds from the TimeOrDateTime. Returns a new 
-    # TimeOrDateTime, preserving what the original constructed type was.
-    # If the original type is a Time and the resulting calculation goes out of
-    # range for Times, then an exception will be raised by the Time class.
-    def -(seconds)
-      self + (-seconds)
-    end
-   
-    # Similar to the + operator, but for cases where adding would cause a 
-    # timestamp or time to go out of the allowed range, converts to a DateTime
-    # based TimeOrDateTime.
-    def add_with_convert(seconds)
-      if seconds == 0
-        self
-      else
-        if @orig.is_a?(DateTime)
-          TimeOrDateTime.new(@orig + OffsetRationals.rational_for_offset(seconds))
-        else
-          # A Time or timestamp.
-          result = to_i + seconds
-          
-          if result < 0 || result > 2147483647
-            result = TimeOrDateTime.new(to_datetime + OffsetRationals.rational_for_offset(seconds))
-          else
-            result = TimeOrDateTime.new(@orig + seconds)
-          end
-        end
-      end
-    end
-    
-    # Returns true if todt represents the same time and was originally 
-    # constructed with the same type (DateTime, Time or timestamp) as this 
-    # TimeOrDateTime.
-    def eql?(todt)
-      todt.respond_to?(:to_orig) && to_orig.eql?(todt.to_orig)      
-    end
-    
-    # Returns a hash of this TimeOrDateTime.
-    def hash
-      @orig.hash
-    end
-    
-    # If no block is given, returns a TimeOrDateTime wrapping the given 
-    # timeOrDateTime. If a block is specified, a TimeOrDateTime is constructed
-    # and passed to the block. The result of the block must be a TimeOrDateTime.
-    # to_orig will be called on the result and the result of to_orig will be
-    # returned.
-    #
-    # timeOrDateTime can be a Time, DateTime, integer timestamp or TimeOrDateTime.
-    # If a TimeOrDateTime is passed in, no new TimeOrDateTime will be constructed,
-    # the passed in value will be used.
-    def self.wrap(timeOrDateTime)      
-      t = timeOrDateTime.is_a?(TimeOrDateTime) ? timeOrDateTime : TimeOrDateTime.new(timeOrDateTime)        
-      
-      if block_given?
-        t = yield t
-        
-        if timeOrDateTime.is_a?(TimeOrDateTime)
-          t          
-        elsif timeOrDateTime.is_a?(Time)
-          t.to_time
-        elsif timeOrDateTime.is_a?(DateTime)
-          t.to_datetime
-        else
-          t.to_i
-        end        
-      else
-        t
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone.rb
deleted file mode 100644
index ef4ecd8ae1..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone.rb
+++ /dev/null
@@ -1,508 +0,0 @@
-#--
-# Copyright (c) 2005-2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'date'
-# require 'tzinfo/country'
-require 'tzinfo/time_or_datetime'
-require 'tzinfo/timezone_period'
-
-module TZInfo
-  # Indicate a specified time in a local timezone has more than one
-  # possible time in UTC. This happens when switching from daylight savings time 
-  # to normal time where the clocks are rolled back. Thrown by period_for_local
-  # and local_to_utc when using an ambiguous time and not specifying any 
-  # means to resolve the ambiguity.
-  class AmbiguousTime < StandardError
-  end
-  
-  # Thrown to indicate that no TimezonePeriod matching a given time could be found.
-  class PeriodNotFound < StandardError
-  end
-  
-  # Thrown by Timezone#get if the identifier given is not valid.
-  class InvalidTimezoneIdentifier < StandardError
-  end
-  
-  # Thrown if an attempt is made to use a timezone created with Timezone.new(nil).
-  class UnknownTimezone < StandardError
-  end
-  
-  # Timezone is the base class of all timezones. It provides a factory method
-  # get to access timezones by identifier. Once a specific Timezone has been
-  # retrieved, DateTimes, Times and timestamps can be converted between the UTC 
-  # and the local time for the zone. For example:
-  #
-  #   tz = TZInfo::Timezone.get('America/New_York')
-  #   puts tz.utc_to_local(DateTime.new(2005,8,29,15,35,0)).to_s
-  #   puts tz.local_to_utc(Time.utc(2005,8,29,11,35,0)).to_s
-  #   puts tz.utc_to_local(1125315300).to_s
-  #
-  # Each time conversion method returns an object of the same type it was 
-  # passed.
-  #
-  # The timezone information all comes from the tz database
-  # (see http://www.twinsun.com/tz/tz-link.htm)
-  class Timezone
-    include Comparable
-    
-    # Cache of loaded zones by identifier to avoid using require if a zone
-    # has already been loaded.
-    @@loaded_zones = {}
-    
-    # Whether the timezones index has been loaded yet.
-    @@index_loaded = false
-    
-    # Returns a timezone by its identifier (e.g. "Europe/London", 
-    # "America/Chicago" or "UTC").
-    #
-    # Raises InvalidTimezoneIdentifier if the timezone couldn't be found.
-    def self.get(identifier)
-      instance = @@loaded_zones[identifier]
-      unless instance  
-        raise InvalidTimezoneIdentifier, 'Invalid identifier' if identifier !~ /^[A-z0-9\+\-_]+(\/[A-z0-9\+\-_]+)*$/
-        identifier = identifier.gsub(/-/, '__m__').gsub(/\+/, '__p__')
-        begin
-          # Use a temporary variable to avoid an rdoc warning
-          file = "tzinfo/definitions/#{identifier}".untaint
-          require file
-          
-          m = Definitions
-          identifier.split(/\//).each {|part|
-            m = m.const_get(part)
-          }
-          
-          info = m.get
-          
-          # Could make Timezone subclasses register an interest in an info
-          # type. Since there are currently only two however, there isn't
-          # much point.
-          if info.kind_of?(DataTimezoneInfo)
-            instance = DataTimezone.new(info)
-          elsif info.kind_of?(LinkedTimezoneInfo)
-            instance = LinkedTimezone.new(info)
-          else
-            raise InvalidTimezoneIdentifier, "No handler for info type #{info.class}"
-          end
-          
-          @@loaded_zones[instance.identifier] = instance         
-        rescue LoadError, NameError => e
-          raise InvalidTimezoneIdentifier, e.message
-        end
-      end
-      
-      instance
-    end
-    
-    # Returns a proxy for the Timezone with the given identifier. The proxy
-    # will cause the real timezone to be loaded when an attempt is made to 
-    # find a period or convert a time. get_proxy will not validate the 
-    # identifier. If an invalid identifier is specified, no exception will be 
-    # raised until the proxy is used. 
-    def self.get_proxy(identifier)
-      TimezoneProxy.new(identifier)
-    end
-    
-    # If identifier is nil calls super(), otherwise calls get. An identfier 
-    # should always be passed in when called externally.
-    def self.new(identifier = nil)
-      if identifier        
-        get(identifier)
-      else
-        super()
-      end
-    end
-    
-    # Returns an array containing all the available Timezones.
-    #
-    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
-    # definitions until a conversion is actually required.
-    def self.all
-      get_proxies(all_identifiers)
-    end
-    
-    # Returns an array containing the identifiers of all the available 
-    # Timezones.
-    def self.all_identifiers
-      load_index
-      Indexes::Timezones.timezones
-    end
-    
-    # Returns an array containing all the available Timezones that are based
-    # on data (are not links to other Timezones).
-    #
-    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
-    # definitions until a conversion is actually required.
-    def self.all_data_zones
-      get_proxies(all_data_zone_identifiers)
-    end
-    
-    # Returns an array containing the identifiers of all the available 
-    # Timezones that are based on data (are not links to other Timezones)..
-    def self.all_data_zone_identifiers
-      load_index
-      Indexes::Timezones.data_timezones
-    end
-    
-    # Returns an array containing all the available Timezones that are links
-    # to other Timezones.
-    #
-    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
-    # definitions until a conversion is actually required.
-    def self.all_linked_zones
-      get_proxies(all_linked_zone_identifiers)      
-    end
-    
-    # Returns an array containing the identifiers of all the available 
-    # Timezones that are links to other Timezones.
-    def self.all_linked_zone_identifiers
-      load_index
-      Indexes::Timezones.linked_timezones
-    end
-    
-    # Returns all the Timezones defined for all Countries. This is not the
-    # complete set of Timezones as some are not country specific (e.g. 
-    # 'Etc/GMT').
-    # 
-    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
-    # definitions until a conversion is actually required.        
-    def self.all_country_zones
-      Country.all_codes.inject([]) {|zones,country|
-        zones += Country.get(country).zones
-      }
-    end
-    
-    # Returns all the zone identifiers defined for all Countries. This is not the
-    # complete set of zone identifiers as some are not country specific (e.g. 
-    # 'Etc/GMT'). You can obtain a Timezone instance for a given identifier
-    # with the get method.
-    def self.all_country_zone_identifiers
-      Country.all_codes.inject([]) {|zones,country|
-        zones += Country.get(country).zone_identifiers
-      }
-    end
-    
-    # Returns all US Timezone instances. A shortcut for 
-    # TZInfo::Country.get('US').zones.
-    #
-    # Returns TimezoneProxy objects to avoid the overhead of loading Timezone
-    # definitions until a conversion is actually required.
-    def self.us_zones
-      Country.get('US').zones
-    end
-    
-    # Returns all US zone identifiers. A shortcut for 
-    # TZInfo::Country.get('US').zone_identifiers.
-    def self.us_zone_identifiers
-      Country.get('US').zone_identifiers
-    end
-    
-    # The identifier of the timezone, e.g. "Europe/Paris".
-    def identifier
-      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
-    end
-    
-    # An alias for identifier.
-    def name
-      # Don't use alias, as identifier gets overridden.
-      identifier
-    end
-    
-    # Returns a friendlier version of the identifier.
-    def to_s
-      friendly_identifier
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #{identifier}>"
-    end
-    
-    # Returns a friendlier version of the identifier. Set skip_first_part to 
-    # omit the first part of the identifier (typically a region name) where
-    # there is more than one part.
-    #
-    # For example:
-    #
-    #   Timezone.get('Europe/Paris').friendly_identifier(false)          #=> "Europe - Paris"
-    #   Timezone.get('Europe/Paris').friendly_identifier(true)           #=> "Paris"
-    #   Timezone.get('America/Indiana/Knox').friendly_identifier(false)  #=> "America - Knox, Indiana"
-    #   Timezone.get('America/Indiana/Knox').friendly_identifier(true)   #=> "Knox, Indiana"           
-    def friendly_identifier(skip_first_part = false)
-      parts = identifier.split('/')
-      if parts.empty?
-        # shouldn't happen
-        identifier
-      elsif parts.length == 1        
-        parts[0]
-      else
-        if skip_first_part
-          result = ''
-        else
-          result = parts[0] + ' - '
-        end
-        
-        parts[1, parts.length - 1].reverse_each {|part|
-          part.gsub!(/_/, ' ')
-          
-          if part.index(/[a-z]/)
-            # Missing a space if a lower case followed by an upper case and the
-            # name isn't McXxxx.
-            part.gsub!(/([^M][a-z])([A-Z])/, '\1 \2')
-            part.gsub!(/([M][a-bd-z])([A-Z])/, '\1 \2')
-            
-            # 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
-      end
-    end
-    
-    # Returns the TimezonePeriod for the given UTC time. utc can either be
-    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
-    # information in utc is ignored (it is treated as a UTC time).        
-    def period_for_utc(utc)            
-      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'      
-    end
-    
-    # Returns the set of TimezonePeriod instances that are valid for the given
-    # local time as an array. If you just want a single period, use 
-    # period_for_local instead and specify how ambiguities should be resolved.
-    # Returns an empty array if no periods are found for the given time.
-    def periods_for_local(local)
-      raise UnknownTimezone, 'TZInfo::Timezone constructed directly'
-    end
-    
-    # Returns the TimezonePeriod for the given local time. local can either be
-    # a DateTime, Time or integer timestamp (Time.to_i). Any timezone 
-    # information in local is ignored (it is treated as a time in the current 
-    # timezone).
-    #
-    # Warning: There are local times that have no equivalent UTC times (e.g.
-    # in the transition from standard time to daylight savings time). There are
-    # also local times that have more than one UTC equivalent (e.g. in the
-    # transition from daylight savings time to standard time).
-    #
-    # In the first case (no equivalent UTC time), a PeriodNotFound exception
-    # will be raised.
-    #
-    # In the second case (more than one equivalent UTC time), an AmbiguousTime
-    # exception will be raised unless the optional dst parameter or block
-    # handles the ambiguity. 
-    #
-    # If the ambiguity is due to a transition from daylight savings time to
-    # standard time, the dst parameter can be used to select whether the 
-    # daylight savings time or local time is used. For example,
-    #
-    #   Timezone.get('America/New_York').period_for_local(DateTime.new(2004,10,31,1,30,0))
-    #
-    # would raise an AmbiguousTime exception.
-    #
-    # Specifying dst=true would the daylight savings period from April to 
-    # October 2004. Specifying dst=false would return the standard period
-    # from October 2004 to April 2005.
-    #
-    # If the dst parameter does not resolve the ambiguity, and a block is 
-    # specified, it is called. The block must take a single parameter - an
-    # array of the periods that need to be resolved. The block can select and
-    # return a single period or return nil or an empty array
-    # to cause an AmbiguousTime exception to be raised.
-    def period_for_local(local, dst = nil)            
-      results = periods_for_local(local)
-      
-      if results.empty?
-        raise PeriodNotFound
-      elsif results.size < 2
-        results.first
-      else
-        # ambiguous result try to resolve
-        
-        if !dst.nil?
-          matches = results.find_all {|period| period.dst? == dst}
-          results = matches if !matches.empty?            
-        end
-        
-        if results.size < 2
-          results.first
-        else
-          # still ambiguous, try the block
-                    
-          if block_given?
-            results = yield results
-          end
-          
-          if results.is_a?(TimezonePeriod)
-            results
-          elsif results && results.size == 1
-            results.first
-          else          
-            raise AmbiguousTime, "#{local} is an ambiguous local time."
-          end
-        end
-      end      
-    end
-    
-    # Converts a time in UTC to the local timezone. utc can either be
-    # a DateTime, Time or timestamp (Time.to_i). The returned time has the same
-    # type as utc. Any timezone information in utc is ignored (it is treated as 
-    # a UTC time).
-    def utc_to_local(utc)
-      TimeOrDateTime.wrap(utc) {|wrapped|
-        period_for_utc(wrapped).to_local(wrapped)
-      }
-    end
-    
-    # Converts a time in the local timezone to UTC. local can either be
-    # a DateTime, Time or timestamp (Time.to_i). The returned time has the same
-    # type as local. Any timezone information in local is ignored (it is treated
-    # as a local time).
-    #
-    # Warning: There are local times that have no equivalent UTC times (e.g.
-    # in the transition from standard time to daylight savings time). There are
-    # also local times that have more than one UTC equivalent (e.g. in the
-    # transition from daylight savings time to standard time).
-    #
-    # In the first case (no equivalent UTC time), a PeriodNotFound exception
-    # will be raised.
-    #
-    # In the second case (more than one equivalent UTC time), an AmbiguousTime
-    # exception will be raised unless the optional dst parameter or block
-    # handles the ambiguity. 
-    #
-    # If the ambiguity is due to a transition from daylight savings time to
-    # standard time, the dst parameter can be used to select whether the 
-    # daylight savings time or local time is used. For example,
-    #
-    #   Timezone.get('America/New_York').local_to_utc(DateTime.new(2004,10,31,1,30,0))
-    #
-    # would raise an AmbiguousTime exception.
-    #
-    # Specifying dst=true would return 2004-10-31 5:30:00. Specifying dst=false
-    # would return 2004-10-31 6:30:00.
-    #
-    # If the dst parameter does not resolve the ambiguity, and a block is 
-    # specified, it is called. The block must take a single parameter - an
-    # array of the periods that need to be resolved. The block can return a
-    # single period to use to convert the time or return nil or an empty array
-    # to cause an AmbiguousTime exception to be raised.
-    def local_to_utc(local, dst = nil)
-      TimeOrDateTime.wrap(local) {|wrapped|
-        if block_given?
-          period = period_for_local(wrapped, dst) {|periods| yield periods }
-        else
-          period = period_for_local(wrapped, dst)
-        end
-        
-        period.to_utc(wrapped)
-      }
-    end
-    
-    # Returns the current time in the timezone as a Time.
-    def now
-      utc_to_local(Time.now.utc)
-    end
-    
-    # Returns the TimezonePeriod for the current time. 
-    def current_period
-      period_for_utc(Time.now.utc)
-    end
-    
-    # Returns the current Time and TimezonePeriod as an array. The first element
-    # is the time, the second element is the period.
-    def current_period_and_time
-      utc = Time.now.utc
-      period = period_for_utc(utc)
-      [period.to_local(utc), period]
-    end
-    
-    alias :current_time_and_period :current_period_and_time
-
-    # Converts a time in UTC to local time and returns it as a string 
-    # according to the given format. The formatting is identical to 
-    # Time.strftime and DateTime.strftime, except %Z is replaced with the
-    # timezone abbreviation for the specified time (for example, EST or EDT).        
-    def strftime(format, utc = Time.now.utc)      
-      period = period_for_utc(utc)
-      local = period.to_local(utc)      
-      local = Time.at(local).utc unless local.kind_of?(Time) || local.kind_of?(DateTime)
-      abbreviation = period.abbreviation.to_s.gsub(/%/, '%%')
-      
-      format = format.gsub(/(.?)%Z/) do
-        if $1 == '%'
-          # return %%Z so the real strftime treats it as a literal %Z too
-          '%%Z'
-        else
-          "#$1#{abbreviation}"
-        end
-      end
-      
-      local.strftime(format)
-    end
-    
-    # Compares two Timezones based on their identifier. Returns -1 if tz is less
-    # than self, 0 if tz is equal to self and +1 if tz is greater than self.
-    def <=>(tz)
-      identifier <=> tz.identifier
-    end
-    
-    # Returns true if and only if the identifier of tz is equal to the 
-    # identifier of this Timezone.
-    def eql?(tz)
-      self == tz
-    end
-    
-    # Returns a hash of this Timezone.
-    def hash
-      identifier.hash
-    end
-    
-    # Dumps this Timezone for marshalling.
-    def _dump(limit)
-      identifier
-    end
-    
-    # Loads a marshalled Timezone.
-    def self._load(data)
-      Timezone.get(data)
-    end
-    
-    private
-      # Loads in the index of timezones if it hasn't already been loaded.
-      def self.load_index
-        unless @@index_loaded
-          require 'tzinfo/indexes/timezones'
-          @@index_loaded = true
-        end        
-      end
-      
-      # Returns an array of proxies corresponding to the given array of 
-      # identifiers.
-      def self.get_proxies(identifiers)
-        identifiers.collect {|identifier| get_proxy(identifier)}
-      end
-  end        
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_definition.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_definition.rb
deleted file mode 100644
index 39ca8bfa53..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_definition.rb
+++ /dev/null
@@ -1,56 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/data_timezone_info'
-require 'tzinfo/linked_timezone_info'
-
-module TZInfo
-  
-  # TimezoneDefinition is included into Timezone definition modules.
-  # TimezoneDefinition provides the methods for defining timezones.
-  module TimezoneDefinition #:nodoc:
-    # Add class methods to the includee.
-    def self.append_features(base)
-      super
-      base.extend(ClassMethods)
-    end
-    
-    # Class methods for inclusion.
-    module ClassMethods #:nodoc:
-      # Returns and yields a DataTimezoneInfo object to define a timezone.
-      def timezone(identifier)
-        yield @timezone = DataTimezoneInfo.new(identifier)
-      end
-      
-      # Defines a linked timezone.
-      def linked_timezone(identifier, link_to_identifier)
-        @timezone = LinkedTimezoneInfo.new(identifier, link_to_identifier)
-      end
-      
-      # Returns the last TimezoneInfo to be defined with timezone or 
-      # linked_timezone.
-      def get
-        @timezone
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_info.rb
deleted file mode 100644
index 68e38c35fb..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_info.rb
+++ /dev/null
@@ -1,40 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-module TZInfo
-  # Represents a timezone defined in a data module.
-  class TimezoneInfo #:nodoc:
-    
-    # The timezone identifier.
-    attr_reader :identifier
-    
-    # Constructs a new TimezoneInfo with an identifier.
-    def initialize(identifier)
-      @identifier = identifier
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #@identifier>"
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_offset_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_offset_info.rb
deleted file mode 100644
index 6a0bbca46f..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_offset_info.rb
+++ /dev/null
@@ -1,94 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-module TZInfo
-  # Represents an offset defined in a Timezone data file.
-  class TimezoneOffsetInfo #:nodoc:
-    # The base offset of the timezone from UTC in seconds.
-    attr_reader :utc_offset
-    
-    # The offset from standard time for the zone in seconds (i.e. non-zero if 
-    # daylight savings is being observed).
-    attr_reader :std_offset
-    
-    # The total offset of this observance from UTC in seconds 
-    # (utc_offset + std_offset).
-    attr_reader :utc_total_offset
-    
-    # The abbreviation that identifies this observance, e.g. "GMT" 
-    # (Greenwich Mean Time) or "BST" (British Summer Time) for "Europe/London". The returned identifier is a 
-    # symbol.
-    attr_reader :abbreviation
-    
-    # Constructs a new TimezoneOffsetInfo. utc_offset and std_offset are
-    # specified in seconds.
-    def initialize(utc_offset, std_offset, abbreviation)
-      @utc_offset = utc_offset
-      @std_offset = std_offset      
-      @abbreviation = abbreviation
-      
-      @utc_total_offset = @utc_offset + @std_offset
-    end
-    
-    # True if std_offset is non-zero.
-    def dst?
-      @std_offset != 0
-    end
-    
-    # Converts a UTC DateTime to local time based on the offset of this period.
-    def to_local(utc)
-      TimeOrDateTime.wrap(utc) {|wrapped|
-        wrapped + @utc_total_offset
-      }
-    end
-    
-    # Converts a local DateTime to UTC based on the offset of this period.
-    def to_utc(local)
-      TimeOrDateTime.wrap(local) {|wrapped|
-        wrapped - @utc_total_offset
-      }
-    end
-    
-    # Returns true if and only if toi has the same utc_offset, std_offset
-    # and abbreviation as this TimezoneOffsetInfo.
-    def ==(toi)
-      toi.respond_to?(:utc_offset) && toi.respond_to?(:std_offset) && toi.respond_to?(:abbreviation) &&
-        utc_offset == toi.utc_offset && std_offset == toi.std_offset && abbreviation == toi.abbreviation
-    end
-    
-    # Returns true if and only if toi has the same utc_offset, std_offset
-    # and abbreviation as this TimezoneOffsetInfo.
-    def eql?(toi)
-      self == toi
-    end
-    
-    # Returns a hash of this TimezoneOffsetInfo.
-    def hash
-      utc_offset.hash ^ std_offset.hash ^ abbreviation.hash
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #@utc_offset,#@std_offset,#@abbreviation>"
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_period.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_period.rb
deleted file mode 100644
index 00888fcfdc..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_period.rb
+++ /dev/null
@@ -1,198 +0,0 @@
-#--
-# Copyright (c) 2005-2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'tzinfo/offset_rationals'
-require 'tzinfo/time_or_datetime'
-
-module TZInfo
-  # A period of time in a timezone where the same offset from UTC applies.
-  #
-  # All the methods that take times accept instances of Time, DateTime or
-  # integer timestamps.
-  class TimezonePeriod
-    # The TimezoneTransitionInfo that defines the start of this TimezonePeriod 
-    # (may be nil if unbounded).
-    attr_reader :start_transition
-    
-    # The TimezoneTransitionInfo that defines the end of this TimezonePeriod
-    # (may be nil if unbounded).
-    attr_reader :end_transition
-    
-    # The TimezoneOffsetInfo for this period.
-    attr_reader :offset    
-    
-    # Initializes a new TimezonePeriod.
-    def initialize(start_transition, end_transition, offset = nil)
-      @start_transition = start_transition
-      @end_transition = end_transition
-      
-      if offset
-        raise ArgumentError, 'Offset specified with transitions' if @start_transition || @end_transition
-        @offset = offset
-      else
-        if @start_transition 
-          @offset = @start_transition.offset
-        elsif @end_transition
-          @offset = @end_transition.previous_offset
-        else
-          raise ArgumentError, 'No offset specified and no transitions to determine it from'
-        end
-      end
-      
-      @utc_total_offset_rational = nil      
-    end
-            
-    # Base offset of the timezone from UTC (seconds).
-    def utc_offset
-      @offset.utc_offset
-    end
-    
-    # Offset from the local time where daylight savings is in effect (seconds).
-    # E.g.: utc_offset could be -5 hours. Normally, std_offset would be 0. 
-    # During daylight savings, std_offset would typically become +1 hours.
-    def std_offset
-      @offset.std_offset
-    end
-    
-    # The identifier of this period, e.g. "GMT" (Greenwich Mean Time) or "BST"
-    # (British Summer Time) for "Europe/London". The returned identifier is a 
-    # symbol.
-    def abbreviation
-      @offset.abbreviation
-    end
-    alias :zone_identifier :abbreviation
-    
-    # Total offset from UTC (seconds). Equal to utc_offset + std_offset.
-    def utc_total_offset
-      @offset.utc_total_offset
-    end
-    
-    # Total offset from UTC (days). Result is a Rational.
-    def utc_total_offset_rational
-      unless @utc_total_offset_rational
-        @utc_total_offset_rational = OffsetRationals.rational_for_offset(utc_total_offset) 
-      end
-      @utc_total_offset_rational
-    end
-    
-    # The start time of the period in UTC as a DateTime. May be nil if unbounded.
-    def utc_start
-      @start_transition ? @start_transition.at.to_datetime : nil
-    end
-    
-    # The end time of the period in UTC as a DateTime. May be nil if unbounded.
-    def utc_end
-      @end_transition ? @end_transition.at.to_datetime : nil
-    end
-    
-    # The start time of the period in local time as a DateTime. May be nil if 
-    # unbounded.
-    def local_start
-      @start_transition ? @start_transition.local_start.to_datetime : nil
-    end
-    
-    # The end time of the period in local time as a DateTime. May be nil if 
-    # unbounded.
-    def local_end
-      @end_transition ? @end_transition.local_end.to_datetime : nil
-    end
-    
-    # true if daylight savings is in effect for this period; otherwise false.
-    def dst?
-      @offset.dst?
-    end
-    
-    # true if this period is valid for the given UTC DateTime; otherwise false.
-    def valid_for_utc?(utc)
-      utc_after_start?(utc) && utc_before_end?(utc) 
-    end
-    
-    # true if the given UTC DateTime is after the start of the period 
-    # (inclusive); otherwise false.
-    def utc_after_start?(utc)
-      !@start_transition || @start_transition.at <= utc
-    end
-    
-    # true if the given UTC DateTime is before the end of the period 
-    # (exclusive); otherwise false.
-    def utc_before_end?(utc)
-      !@end_transition || @end_transition.at > utc
-    end
-    
-    # true if this period is valid for the given local DateTime; otherwise false.
-    def valid_for_local?(local)      
-      local_after_start?(local) && local_before_end?(local) 
-    end
-    
-    # true if the given local DateTime is after the start of the period 
-    # (inclusive); otherwise false.
-    def local_after_start?(local)
-      !@start_transition || @start_transition.local_start <= local
-    end
-    
-    # true if the given local DateTime is before the end of the period 
-    # (exclusive); otherwise false.
-    def local_before_end?(local)
-      !@end_transition || @end_transition.local_end > local
-    end
-    
-    # Converts a UTC DateTime to local time based on the offset of this period.
-    def to_local(utc)
-      @offset.to_local(utc)
-    end
-    
-    # Converts a local DateTime to UTC based on the offset of this period.
-    def to_utc(local)
-      @offset.to_utc(local)
-    end
-    
-    # Returns true if this TimezonePeriod is equal to p. This compares the 
-    # start_transition, end_transition and offset using ==.
-    def ==(p)
-      p.respond_to?(:start_transition) && p.respond_to?(:end_transition) &&
-        p.respond_to?(:offset) && start_transition == p.start_transition &&
-        end_transition == p.end_transition && offset == p.offset
-    end
-    
-    # Returns true if this TimezonePeriods is equal to p. This compares the
-    # start_transition, end_transition and offset using eql?
-    def eql?(p)
-      p.respond_to?(:start_transition) && p.respond_to?(:end_transition) &&
-        p.respond_to?(:offset) && start_transition.eql?(p.start_transition) &&
-        end_transition.eql?(p.end_transition) && offset.eql?(p.offset)
-    end
-    
-    # Returns a hash of this TimezonePeriod.
-    def hash
-      result = @start_transition.hash ^ @end_transition.hash
-      result ^= @offset.hash unless @start_transition || @end_transition
-      result       
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      result = "#<#{self.class}: #{@start_transition.inspect},#{@end_transition.inspect}"
-      result << ",#{@offset.inspect}>" unless @start_transition || @end_transition
-      result + '>'
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_transition_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_transition_info.rb
deleted file mode 100644
index 6b0669cc4a..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_transition_info.rb
+++ /dev/null
@@ -1,129 +0,0 @@
-#--
-# Copyright (c) 2006 Philip Ross
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#++
-
-require 'date'
-require 'tzinfo/time_or_datetime'
-
-module TZInfo
-  # Represents an offset defined in a Timezone data file.
-  class TimezoneTransitionInfo #:nodoc:
-    # The offset this transition changes to (a TimezoneOffsetInfo instance).
-    attr_reader :offset
-    
-    # The offset this transition changes from (a TimezoneOffsetInfo instance).
-    attr_reader :previous_offset
-    
-    # The numerator of the DateTime if the transition time is defined as a 
-    # DateTime, otherwise the transition time as a timestamp.
-    attr_reader :numerator_or_time
-    protected :numerator_or_time
-    
-    # Either the denominotor of the DateTime if the transition time is defined
-    # as a DateTime, otherwise nil. 
-    attr_reader :denominator
-    protected :denominator
-    
-    # Creates a new TimezoneTransitionInfo with the given offset, 
-    # previous_offset (both TimezoneOffsetInfo instances) and UTC time. 
-    # if denominator is nil, numerator_or_time is treated as a number of 
-    # seconds since the epoch. If denominator is specified numerator_or_time
-    # and denominator are used to create a DateTime as follows:
-    # 
-    #  DateTime.new!(Rational.send(:new!, numerator_or_time, denominator), 0, Date::ITALY)
-    #
-    # For performance reasons, the numerator and denominator must be specified
-    # in their lowest form.
-    def initialize(offset, previous_offset, numerator_or_time, denominator = nil)
-      @offset = offset
-      @previous_offset = previous_offset
-      @numerator_or_time = numerator_or_time
-      @denominator = denominator
-      
-      @at = nil
-      @local_end = nil
-      @local_start = nil
-    end
-    
-    # A TimeOrDateTime instance representing the UTC time when this transition
-    # occurs.
-    def at
-      unless @at
-        unless @denominator 
-          @at = TimeOrDateTime.new(@numerator_or_time)
-        else
-          r = RubyCoreSupport.rational_new!(@numerator_or_time, @denominator)
-          dt = RubyCoreSupport.datetime_new!(r, 0, Date::ITALY)
-          @at = TimeOrDateTime.new(dt)
-        end
-      end
-      
-      @at
-    end
-    
-    # A TimeOrDateTime instance representing the local time when this transition
-    # causes the previous observance to end (calculated from at using 
-    # previous_offset).
-    def local_end
-      @local_end = at.add_with_convert(@previous_offset.utc_total_offset) unless @local_end      
-      @local_end
-    end
-    
-    # A TimeOrDateTime instance representing the local time when this transition
-    # causes the next observance to start (calculated from at using offset).
-    def local_start
-      @local_start = at.add_with_convert(@offset.utc_total_offset) unless @local_start
-      @local_start
-    end
-    
-    # Returns true if this TimezoneTransitionInfo is equal to the given
-    # TimezoneTransitionInfo. Two TimezoneTransitionInfo instances are 
-    # considered to be equal by == if offset, previous_offset and at are all 
-    # equal.
-    def ==(tti)
-      tti.respond_to?(:offset) && tti.respond_to?(:previous_offset) && tti.respond_to?(:at) &&
-        offset == tti.offset && previous_offset == tti.previous_offset && at == tti.at
-    end
-    
-    # Returns true if this TimezoneTransitionInfo is equal to the given
-    # TimezoneTransitionInfo. Two TimezoneTransitionInfo instances are 
-    # considered to be equal by eql? if offset, previous_offset, 
-    # numerator_or_time and denominator are all equal. This is stronger than ==,
-    # which just requires the at times to be equal regardless of how they were
-    # originally specified.
-    def eql?(tti)
-      tti.respond_to?(:offset) && tti.respond_to?(:previous_offset) &&
-        tti.respond_to?(:numerator_or_time) && tti.respond_to?(:denominator) &&
-        offset == tti.offset && previous_offset == tti.previous_offset &&
-        numerator_or_time == tti.numerator_or_time && denominator == tti.denominator        
-    end
-    
-    # Returns a hash of this TimezoneTransitionInfo instance.
-    def hash
-      @offset.hash ^ @previous_offset.hash ^ @numerator_or_time.hash ^ @denominator.hash
-    end
-    
-    # Returns internal object state as a programmer-readable string.
-    def inspect
-      "#<#{self.class}: #{at.inspect},#{@offset.inspect}>"      
-    end
-  end
-end
diff --git a/activesupport/test/core_ext/array_ext_test.rb b/activesupport/test/core_ext/array_ext_test.rb
index f5f91ddd80..d4cd5ddbde 100644
--- a/activesupport/test/core_ext/array_ext_test.rb
+++ b/activesupport/test/core_ext/array_ext_test.rb
@@ -52,8 +52,6 @@ class ArrayExtToParamTests < Test::Unit::TestCase
 end
 
 class ArrayExtToSentenceTests < Test::Unit::TestCase
-  include ActiveSupport::Testing::Deprecation
-  
   def test_plain_array_to_sentence
     assert_equal "", [].to_sentence
     assert_equal "one", ['one'].to_sentence
@@ -62,28 +60,12 @@ class ArrayExtToSentenceTests < Test::Unit::TestCase
   end
 
   def test_to_sentence_with_words_connector
-    assert_deprecated(":connector has been deprecated. Use :words_connector instead") do
-      assert_equal "one, two, three", ['one', 'two', 'three'].to_sentence(:connector => '')
-    end
-    
-    assert_deprecated(":connector has been deprecated. Use :words_connector instead") do
-      assert_equal "one, two, and three", ['one', 'two', 'three'].to_sentence(:connector => 'and ')
-    end
-    
     assert_equal "one two, and three", ['one', 'two', 'three'].to_sentence(:words_connector => ' ')
     assert_equal "one & two, and three", ['one', 'two', 'three'].to_sentence(:words_connector => ' & ')
     assert_equal "onetwo, and three", ['one', 'two', 'three'].to_sentence(:words_connector => nil)
   end
 
   def test_to_sentence_with_last_word_connector
-    assert_deprecated(":skip_last_comma has been deprecated. Use :last_word_connector instead") do
-      assert_equal "one, two and three", ['one', 'two', 'three'].to_sentence(:skip_last_comma => true)
-    end
-    
-    assert_deprecated(":skip_last_comma has been deprecated. Use :last_word_connector instead") do
-      assert_equal "one, two, and three", ['one', 'two', 'three'].to_sentence(:skip_last_comma => false)
-    end
-    
     assert_equal "one, two, and also three", ['one', 'two', 'three'].to_sentence(:last_word_connector => ', and also ')
     assert_equal "one, twothree", ['one', 'two', 'three'].to_sentence(:last_word_connector => nil)
     assert_equal "one, two three", ['one', 'two', 'three'].to_sentence(:last_word_connector => ' ')
@@ -320,6 +302,28 @@ class ArrayExtractOptionsTests < Test::Unit::TestCase
   end
 end
 
+class ArrayUniqByTests < Test::Unit::TestCase
+  def test_uniq_by
+    assert_equal [1,2], [1,2,3,4].uniq_by { |i| i.odd? }
+    assert_equal [1,2], [1,2,3,4].uniq_by(&:even?)
+    assert_equal (-5..0).to_a, (-5..5).to_a.uniq_by{ |i| i**2 }
+  end
+
+  def test_uniq_by!
+    a = [1,2,3,4]
+    a.uniq_by! { |i| i.odd? }
+    assert_equal [1,2], a
+
+    a = [1,2,3,4]
+    a.uniq_by! { |i| i.even? }
+    assert_equal [1,2], a
+
+    a = (-5..5).to_a
+    a.uniq_by! { |i| i**2 }
+    assert_equal (-5..0).to_a, a
+  end
+end
+
 class ArrayExtRandomTests < Test::Unit::TestCase
   def test_random_element_from_array
     assert_nil [].rand
diff --git a/activesupport/test/core_ext/class_test.rb b/activesupport/test/core_ext/class_test.rb
deleted file mode 100644
index bb4eb3c7d5..0000000000
--- a/activesupport/test/core_ext/class_test.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'abstract_unit'
-require 'active_support/core_ext/class'
-
-class A
-end
-
-module X
-  class B
-  end
-end
-
-module Y
-  module Z
-    class C
-    end
-  end
-end
-
-class ClassTest < Test::Unit::TestCase
-  def test_removing_class_in_root_namespace
-    assert A.is_a?(Class)
-    Class.remove_class(A)
-    assert_raise(NameError) { A.is_a?(Class) }
-  end
-
-  def test_removing_class_in_one_level_namespace
-    assert X::B.is_a?(Class)
-    Class.remove_class(X::B)
-    assert_raise(NameError) { X::B.is_a?(Class) }
-  end
-
-  def test_removing_class_in_two_level_namespace
-    assert Y::Z::C.is_a?(Class)
-    Class.remove_class(Y::Z::C)
-    assert_raise(NameError) { Y::Z::C.is_a?(Class) }
-  end
-  
-  def test_retrieving_subclasses
-    @parent   = eval("class D; end; D")
-    @sub      = eval("class E < D; end; E")
-    @subofsub = eval("class F < E; end; F")
-    assert_equal 2, @parent.subclasses.size
-    assert_equal [@subofsub.to_s], @sub.subclasses
-    assert_equal [], @subofsub.subclasses
-    assert_equal [@sub.to_s, @subofsub.to_s].sort, @parent.subclasses.sort
-  end
-end
diff --git a/activesupport/test/core_ext/object_and_class_ext_test.rb b/activesupport/test/core_ext/object_and_class_ext_test.rb
index e6fbdb637b..0b2a9c418e 100644
--- a/activesupport/test/core_ext/object_and_class_ext_test.rb
+++ b/activesupport/test/core_ext/object_and_class_ext_test.rb
@@ -1,7 +1,6 @@
 require 'abstract_unit'
 require 'active_support/time'
 require 'active_support/core_ext/object'
-require 'active_support/core_ext/class/removal'
 
 class ClassA; end
 class ClassB < ClassA; end
@@ -40,99 +39,7 @@ class Foo
   include Bar
 end
 
-class ClassExtTest < Test::Unit::TestCase
-  def test_methods
-    assert defined?(ClassB)
-    assert defined?(ClassC)
-    assert defined?(ClassD)
-
-    ClassA.remove_subclasses
-
-    assert !defined?(ClassB)
-    assert !defined?(ClassC)
-    assert !defined?(ClassD)
-  end
-
-  def test_subclasses_of
-    cj = ClassJ
-    assert_equal [ClassJ], Object.subclasses_of(ClassI)
-    ClassI.remove_subclasses
-    assert_equal [], Object.subclasses_of(ClassI)
-  ensure
-    Object.const_set :ClassJ, cj
-  end
-
-  def test_subclasses_of_should_find_nested_classes
-    assert Object.subclasses_of(ClassK).include?(Nested::ClassL)
-  end
-
-  def test_subclasses_of_should_not_return_removed_classes
-    # First create the removed class
-    old_class = Nested.class_eval { remove_const :ClassL }
-    new_class = Class.new(ClassK)
-    Nested.const_set :ClassL, new_class
-    assert_equal "Nested::ClassL", new_class.name # Sanity check
-
-    subclasses = Object.subclasses_of(ClassK)
-    assert subclasses.include?(new_class)
-    assert ! subclasses.include?(old_class)
-  ensure
-    Nested.const_set :ClassL, old_class unless defined?(Nested::ClassL)
-  end
-  
-  def test_subclasses_of_should_not_trigger_const_missing
-    const_missing = false
-    Nested.on_const_missing { const_missing = true }
-    
-    subclasses = Object.subclasses_of ClassK
-    assert !const_missing
-    assert_equal [ Nested::ClassL ], subclasses
-    
-    removed = Nested.class_eval { remove_const :ClassL }  # keep it in memory
-    subclasses = Object.subclasses_of ClassK
-    assert !const_missing
-    assert subclasses.empty?
-  ensure
-    Nested.const_set :ClassL, removed unless defined?(Nested::ClassL)
-  end
-  
-  def test_subclasses_of_with_multiple_roots
-    classes = Object.subclasses_of(ClassI, ClassK)
-    assert_equal %w(ClassJ Nested::ClassL), classes.collect(&:to_s).sort
-  end
-
-  def test_subclasses_of_doesnt_find_anonymous_classes
-    assert_equal [], Object.subclasses_of(Foo)
-    bar = Class.new(Foo)
-    assert_nothing_raised do
-      assert_equal [bar], Object.subclasses_of(Foo)
-    end
-  end
-end
-
 class ObjectTests < Test::Unit::TestCase
-  def test_extended_by
-    foo = Foo.new
-    assert foo.extended_by.include?(Bar)
-    foo.extend(Baz)
-    assert(([Bar, Baz] - foo.extended_by).empty?, "Expected Bar, Baz in #{foo.extended_by.inspect}")
-  end
-
-  def test_extend_with_included_modules_from
-    foo, object = Foo.new, Object.new
-    assert !object.respond_to?(:bar)
-    assert !object.respond_to?(:baz)
-
-    object.extend_with_included_modules_from(foo)
-    assert object.respond_to?(:bar)
-    assert !object.respond_to?(:baz)
-
-    foo.extend(Baz)
-    object.extend_with_included_modules_from(foo)
-    assert object.respond_to?(:bar)
-    assert object.respond_to?(:baz)
-  end
-
   class DuckTime
     def acts_like_time?
       true
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index f6003bc083..08c079e113 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -722,6 +722,10 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
   def test_minus_with_time_with_zone
     assert_equal  86_400.0, Time.utc(2000, 1, 2) - ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1), ActiveSupport::TimeZone['UTC'] )
   end
+  
+  def test_minus_with_datetime
+    assert_equal  86_400.0, Time.utc(2000, 1, 2) - DateTime.civil(2000, 1, 1)
+  end
 
   def test_time_created_with_local_constructor_cannot_represent_times_during_hour_skipped_by_dst
     with_env_tz 'US/Eastern' do
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index 3a12100e86..d88f79ae4f 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -56,8 +56,11 @@ class TimeWithZoneTest < Test::Unit::TestCase
     assert_equal 'EDT', ActiveSupport::TimeWithZone.new(Time.utc(2000, 6), @time_zone).zone #dst
   end
 
-  def test_to_json
+  def test_to_json_with_use_standard_json_time_format_config_set_to_false
+    old, ActiveSupport.use_standard_json_time_format = ActiveSupport.use_standard_json_time_format, false
     assert_equal "\"1999/12/31 19:00:00 -0500\"", ActiveSupport::JSON.encode(@twz)
+  ensure
+    ActiveSupport.use_standard_json_time_format = old
   end
 
   def test_to_json_with_use_standard_json_time_format_config_set_to_true
diff --git a/activesupport/test/ordered_hash_test.rb b/activesupport/test/ordered_hash_test.rb
index 1521279437..d070206d44 100644
--- a/activesupport/test/ordered_hash_test.rb
+++ b/activesupport/test/ordered_hash_test.rb
@@ -198,4 +198,28 @@ class OrderedHashTest < Test::Unit::TestCase
     assert_same original, @ordered_hash
     assert_equal @other_ordered_hash.keys, @ordered_hash.keys
   end
+
+  def test_each_after_yaml_serialization
+    values = []
+    @deserialized_ordered_hash = YAML::load(YAML::dump(@ordered_hash))
+
+    @deserialized_ordered_hash.each {|key, value| values << value}
+    assert_equal @values, values
+  end
+
+  def test_order_after_yaml_serialization
+    @deserialized_ordered_hash = YAML::load(YAML::dump(@ordered_hash))
+
+    assert_equal @keys,   @deserialized_ordered_hash.keys
+    assert_equal @values, @deserialized_ordered_hash.values
+  end
+
+  def test_order_after_yaml_serialization_with_nested_arrays
+    @ordered_hash[:array] = %w(a b c)
+
+    @deserialized_ordered_hash = YAML::load(YAML::dump(@ordered_hash))
+
+    assert_equal @ordered_hash.keys,   @deserialized_ordered_hash.keys
+    assert_equal @ordered_hash.values, @deserialized_ordered_hash.values
+  end
 end