Merge branch 'master' of git://github.com/rails/rails

163 files changed, 982 insertions, 684 deletions

diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index 9c5803c52a..4edeadf10c 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,9 @@
 *Edge*
 
+* Update Edinburgh TimeZone to use "Europe/London" instead of "Europe/Dublin" #3310 [Phil Ross]
+
+* Update bundled TZInfo to v0.3.15 [Geoff Buesing]
+
 * JSON: +Object#to_json+ calls +as_json+ to coerce itself into something natively encodable like +Hash+, +Integer+, or +String+. Override +as_json+ instead of +to_json+ so you're JSON library agnostic.  [Jeremy Kemper]
 
 * String #to_time and #to_datetime: handle fractional seconds #864 [Jason Frey]
diff --git a/activesupport/Rakefile b/activesupport/Rakefile
index c27167287d..2ada91830f 100644
--- a/activesupport/Rakefile
+++ b/activesupport/Rakefile
@@ -49,8 +49,6 @@ spec = eval(File.read('activesupport.gemspec'))
 
 Rake::GemPackageTask.new(spec) do |p|
   p.gem_spec = spec
-  p.need_tar = true
-  p.need_zip = true
 end
 
 desc "Publish the beta gem"
@@ -61,7 +59,7 @@ task :pgem => [:package] do
 end
 
 desc "Publish the API documentation"
-task :pdoc => [:rdoc] do 
+task :pdoc => [:rdoc] do
   require 'rake/contrib/sshpublisher'
   Rake::SshDirPublisher.new("wrath.rubyonrails.org", "public_html/as", "doc").upload
 end
@@ -88,39 +86,39 @@ namespace :tzinfo 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}/tzinfo"
-    cp "#{tmp_path}/lib/tzinfo.rb", destination_path
-    comment_requires_for_excluded_classes!('tzinfo.rb')
+    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}/tzinfo"
-        comment_requires_for_excluded_classes!("tzinfo/#{filename}")
+        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}/tzinfo/definitions/"
+    definitions_path = "#{destination_path}/lib/tzinfo/definitions/"
     mkdir_p definitions_path
     ActiveSupport::TimeZone::MAPPING.values.each do |zone|
       subdir = nil
@@ -135,11 +133,11 @@ namespace :tzinfo do
   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
@@ -149,29 +147,29 @@ namespace :tzinfo do
         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
diff --git a/activesupport/lib/active_support/autoload.rb b/activesupport/lib/active_support/autoload.rb
index a0fc2bb123..63f7338a68 100644
--- a/activesupport/lib/active_support/autoload.rb
+++ b/activesupport/lib/active_support/autoload.rb
@@ -2,6 +2,7 @@ module ActiveSupport
   autoload :BacktraceCleaner, 'active_support/backtrace_cleaner'
   autoload :Base64, 'active_support/base64'
   autoload :BasicObject, 'active_support/basic_object'
+  autoload :Benchmarkable, 'active_support/benchmarkable'
   autoload :BufferedLogger, 'active_support/buffered_logger'
   autoload :Cache, 'active_support/cache'
   autoload :Callbacks, 'active_support/callbacks'
@@ -17,9 +18,9 @@ module ActiveSupport
   autoload :MessageVerifier, 'active_support/message_verifier'
   autoload :Multibyte, 'active_support/multibyte'
   autoload :OptionMerger, 'active_support/option_merger'
-  autoload :Orchestra, 'active_support/orchestra'
   autoload :OrderedHash, 'active_support/ordered_hash'
   autoload :OrderedOptions, 'active_support/ordered_options'
+  autoload :Notifications, 'active_support/notifications'
   autoload :Rescuable, 'active_support/rescuable'
   autoload :SecureRandom, 'active_support/secure_random'
   autoload :StringInquirer, 'active_support/string_inquirer'
diff --git a/activesupport/lib/active_support/benchmarkable.rb b/activesupport/lib/active_support/benchmarkable.rb
new file mode 100644
index 0000000000..6a41aab166
--- /dev/null
+++ b/activesupport/lib/active_support/benchmarkable.rb
@@ -0,0 +1,59 @@
+require 'active_support/core_ext/benchmark'
+
+module ActiveSupport
+  module Benchmarkable
+    # Allows you to measure the execution time of a block 
+    # in a template and records the result to the log. Wrap this block around
+    # expensive operations or possible bottlenecks to get a time reading
+    # for the operation.  For example, let's say you thought your file 
+    # processing method was taking too long; you could wrap it in a benchmark block.
+    #
+    #  <% benchmark "Process data files" do %>
+    #    <%= expensive_files_operation %>
+    #  <% end %>
+    #
+    # That would add something like "Process data files (345.2ms)" to the log,
+    # which you can then use to compare timings when optimizing your code.
+    #
+    # You may give an optional logger level as the :level option.
+    # (:debug, :info, :warn, :error); the default value is :info.
+    #
+    #  <% benchmark "Low-level files", :level => :debug do %>
+    #    <%= lowlevel_files_operation %>
+    #  <% end %>
+    #
+    # Finally, you can pass true as the third argument to silence all log activity 
+    # inside the block. This is great for boiling down a noisy block to just a single statement:
+    #
+    #  <% benchmark "Process data files", :level => :info, :silence => true do %>
+    #    <%= expensive_and_chatty_files_operation %>
+    #  <% end %>
+    def benchmark(message = "Benchmarking", options = {})
+      if logger
+        if options.is_a?(Symbol)
+          ActiveSupport::Deprecation.warn("use benchmark('#{message}', :level => :#{options}) instead", caller)
+          options = { :level => options, :silence => false }
+        else
+          options.assert_valid_keys(:level, :silence)
+          options[:level] ||= :info
+        end
+
+        result = nil
+        ms = Benchmark.ms { result = options[:silence] ? logger.silence { yield } : yield }
+        logger.send(options[:level], '%s (%.1fms)' % [ message, ms ])
+        result
+      else
+        yield
+      end
+    end
+
+    # Silence the logger during the execution of the block.
+    #
+    def silence
+      old_logger_level, logger.level = logger.level, ::Logger::ERROR if logger
+      yield
+    ensure
+      logger.level = old_logger_level if logger
+    end
+  end
+end
diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index dfce507b33..29c3843d16 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -53,7 +53,6 @@ module ActiveSupport
         FileUtils.mkdir_p(File.dirname(log))
         @log = open(log, (File::WRONLY | File::APPEND | File::CREAT))
         @log.sync = true
-        @log.write("# Logfile created on %s" % [Time.now.to_s])
       end
     end
 
diff --git a/activesupport/lib/active_support/cache.rb b/activesupport/lib/active_support/cache.rb
index a415686020..818983fdd6 100644
--- a/activesupport/lib/active_support/cache.rb
+++ b/activesupport/lib/active_support/cache.rb
@@ -105,7 +105,7 @@ module ActiveSupport
     #   cache.write("city", "Duckburgh")
     #   cache.read("city")   # => "Duckburgh"
     class Store
-      cattr_accessor :logger
+      cattr_accessor :logger, :instance_writter => false
 
       attr_reader :silence
       alias :silence? :silence
@@ -122,6 +122,15 @@ module ActiveSupport
         @silence = previous_silence
       end
 
+      # Set to true if cache stores should be instrumented. By default is false.
+      def self.instrument=(boolean)
+        Thread.current[:instrument_cache_store] = boolean
+      end
+
+      def self.instrument
+        Thread.current[:instrument_cache_store] || false
+      end
+
       # Fetches data from the cache, using the given key. If there is data in
       # the cache with the given key, then that data is returned.
       #
@@ -219,7 +228,6 @@ module ActiveSupport
       end
 
       def increment(key, amount = 1)
-        log("incrementing", key, amount)
         if num = read(key)
           write(key, num + amount)
         else
@@ -228,7 +236,6 @@ module ActiveSupport
       end
 
       def decrement(key, amount = 1)
-        log("decrementing", key, amount)
         if num = read(key)
           write(key, num - amount)
         else
@@ -244,16 +251,20 @@ module ActiveSupport
         end
 
         def instrument(operation, key, options, &block)
-          payload = { :key => key }
-          payload.merge!(options) if options.is_a?(Hash)
+          log(operation, key, options)
 
-          event = ActiveSupport::Orchestra.instrument(:"cache_#{operation}", payload, &block)
-          log("#{operation} (%.1fms)" % event.duration, key, options)
-          event.result
+          if self.class.instrument
+            payload = { :key => key }
+            payload.merge!(options) if options.is_a?(Hash)
+            ActiveSupport::Notifications.instrument(:"cache_#{operation}", payload, &block)
+          else
+            yield
+          end
         end
 
         def log(operation, key, options)
-          logger.debug("Cache #{operation}: #{key}#{options ? " (#{options.inspect})" : ""}") if logger && !silence?
+          return unless logger && !silence?
+          logger.debug("Cache #{operation}: #{key}#{options ? " (#{options.inspect})" : ""}")
         end
     end
   end
diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb
index 516af99ce9..bec9de86ed 100644
--- a/activesupport/lib/active_support/cache/mem_cache_store.rb
+++ b/activesupport/lib/active_support/cache/mem_cache_store.rb
@@ -103,17 +103,20 @@ module ActiveSupport
       end
 
       def increment(key, amount = 1) # :nodoc:
-        log("incrementing", key, amount)
+        response = instrument(:increment, key, :amount => amount) do
+          @data.incr(key, amount)
+        end
 
-        response = @data.incr(key, amount)
         response == Response::NOT_FOUND ? nil : response
       rescue MemCache::MemCacheError
         nil
       end
 
       def decrement(key, amount = 1) # :nodoc:
-        log("decrement", key, amount)
-        response = @data.decr(key, amount)
+        response = instrument(:decrement, key, :amount => amount) do
+          @data.decr(key, amount)
+        end
+
         response == Response::NOT_FOUND ? nil : response
       rescue MemCache::MemCacheError
         nil
diff --git a/activesupport/lib/active_support/core_ext/array/wrap.rb b/activesupport/lib/active_support/core_ext/array/wrap.rb
index 9d45c2739b..38bb68c1ec 100644
--- a/activesupport/lib/active_support/core_ext/array/wrap.rb
+++ b/activesupport/lib/active_support/core_ext/array/wrap.rb
@@ -2,17 +2,13 @@ class Array
   # Wraps the object in an Array unless it's an Array.  Converts the
   # object to an Array using #to_ary if it implements that.
   def self.wrap(object)
-    case object
-    when nil
+    if object.nil?
       []
-    when self
-      object
+    # to_a doesn't work correctly with Array() but to_ary always does
+    elsif object.respond_to?(:to_a) && !object.respond_to?(:to_ary)
+      [object]
     else
-      if object.respond_to?(:to_ary)
-        object.to_ary
-      else
-        [object]
-      end
+      Array(object)
     end
   end
 end
diff --git a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
index 6c67df7f50..301c09fc73 100644
--- a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
+++ b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
@@ -1,39 +1,57 @@
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/object/duplicable'
+require 'active_support/core_ext/array/extract_options'
 
 class Class
   def superclass_delegating_reader(*names)
-    class_name_to_stop_searching_on = superclass.name.blank? ? "Object" : superclass.name
+    class_to_stop_searching_on = superclass.name.blank? ? "Object" : superclass.name
+    options = names.extract_options!
+
     names.each do |name|
-      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        def self.#{name}                                            # def self.only_reader
-          if defined?(@#{name})                                     #   if defined?(@only_reader)
-            @#{name}                                                #     @only_reader
-          elsif superclass < #{class_name_to_stop_searching_on} &&  #   elsif superclass < Object &&
-                superclass.respond_to?(:#{name})                    #         superclass.respond_to?(:only_reader)
-            superclass.#{name}                                      #     superclass.only_reader
-          end                                                       #   end
-        end                                                         # end
-        def #{name}                                                 # def only_reader
-          self.class.#{name}                                        #   self.class.only_reader
-        end                                                         # end
-        def self.#{name}?                                           # def self.only_reader?
-          !!#{name}                                                 #   !!only_reader
-        end                                                         # end
-        def #{name}?                                                # def only_reader?
-          !!#{name}                                                 #   !!only_reader
-        end                                                         # end
+      # def self.only_reader
+      #   if defined?(@only_reader)
+      #     @only_reader
+      #   elsif superclass < Object && superclass.respond_to?(:only_reader)
+      #     superclass.only_reader
+      #   end
+      # end
+      class_eval <<-EOS, __FILE__, __LINE__ + 1
+        def self.#{name}
+          if defined?(@#{name})
+            @#{name}
+          elsif superclass < #{class_to_stop_searching_on} && superclass.respond_to?(:#{name})
+            superclass.#{name}
+          end
+        end
       EOS
+
+      unless options[:instance_reader] == false
+        class_eval <<-EOS, __FILE__, __LINE__ + 1
+          def #{name}                                  # def only_reader
+            self.class.#{name}                         #   self.class.only_reader
+          end                                          # end
+          def self.#{name}?                            # def self.only_reader?
+            !!#{name}                                  #   !!only_reader
+          end                                          # end
+          def #{name}?                                 # def only_reader?
+            !!#{name}                                  #   !!only_reader
+          end                                          # end
+        EOS
+      end
     end
   end
 
   def superclass_delegating_writer(*names, &block)
+    options = names.extract_options!
+
     names.each do |name|
-      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+      class_eval <<-EOS, __FILE__, __LINE__ + 1
         def self.#{name}=(value)     # def self.property=(value)
           @#{name} = value           #   @property = value
         end                          # end
       EOS
-      self.send("#{name}=", yield) if block_given?
+
+      self.send(:"#{name}=", yield) if block_given?
     end
   end
 
diff --git a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
index 8bac2dff19..e4d22516c1 100644
--- a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
+++ b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/duplicable'
+require 'active_support/core_ext/array/extract_options'
 
 # Retain for backward compatibility.  Methods are now included in Class.
 module ClassInheritableAttributes # :nodoc:
@@ -10,16 +11,19 @@ end
 # children, which is unlike the regular class-level attributes that are shared across the entire hierarchy.
 class Class # :nodoc:
   def class_inheritable_reader(*syms)
+    options = syms.extract_options!
     syms.each do |sym|
       next if sym.is_a?(Hash)
       class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-        def self.#{sym}                         # def self.after_add
-          read_inheritable_attribute(:#{sym})   #   read_inheritable_attribute(:after_add)
-        end                                     # end
-
-        def #{sym}                              # def after_add
-          self.class.#{sym}                     #   self.class.after_add
-        end                                     # end
+        def self.#{sym}                                # def self.after_add
+          read_inheritable_attribute(:#{sym})          #   read_inheritable_attribute(:after_add)
+        end                                            # end
+                                                       #
+        #{"                                            #
+        def #{sym}                                     # def after_add
+          self.class.#{sym}                            #   self.class.after_add
+        end                                            # end
+        " unless options[:instance_reader] == false }  # # the reader above is generated unless options[:instance_reader] == false
       EOS
     end
   end
@@ -156,7 +160,7 @@ class Class
   #   moving on). In particular, this makes the return value of this function
   #   less useful.
   def extlib_inheritable_reader(*ivars)
-    instance_reader = ivars.pop[:reader] if ivars.last.is_a?(Hash)
+    options = ivars.extract_options!
 
     ivars.each do |ivar|
       self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
@@ -164,10 +168,10 @@ class Class
           return @#{ivar} if self.object_id == #{self.object_id} || defined?(@#{ivar})
           ivar = superclass.#{ivar}
           return nil if ivar.nil? && !#{self}.instance_variable_defined?("@#{ivar}")
-          @#{ivar} = ivar && !ivar.is_a?(Module) && !ivar.is_a?(Numeric) && !ivar.is_a?(TrueClass) && !ivar.is_a?(FalseClass) ? ivar.dup : ivar
+          @#{ivar} = ivar.duplicable? ? ivar.dup : ivar
         end
       RUBY
-      unless instance_reader == false
+      unless options[:instance_reader] == false
         self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{ivar}
             self.class.#{ivar}
@@ -190,14 +194,15 @@ class Class
   # @todo We need a style for class_eval <<-HEREDOC. I'd like to make it
   #   class_eval(<<-RUBY, __FILE__, __LINE__), but we should codify it somewhere.
   def extlib_inheritable_writer(*ivars)
-    instance_writer = ivars.pop[:writer] if ivars.last.is_a?(Hash)
+    options = ivars.extract_options!
+
     ivars.each do |ivar|
       self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
         def self.#{ivar}=(obj)
           @#{ivar} = obj
         end
       RUBY
-      unless instance_writer == false
+      unless options[:instance_writer] == false
         self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{ivar}=(obj) self.class.#{ivar} = obj end
         RUBY
diff --git a/activesupport/lib/active_support/core_ext/hash/slice.rb b/activesupport/lib/active_support/core_ext/hash/slice.rb
index 7aa394d7bf..e4a864c20f 100644
--- a/activesupport/lib/active_support/core_ext/hash/slice.rb
+++ b/activesupport/lib/active_support/core_ext/hash/slice.rb
@@ -29,4 +29,10 @@ class Hash
     replace(hash)
     omit
   end
+
+  def extract!(*keys)
+    result = {}
+    keys.each {|key| result[key] = delete(key) }
+    result
+  end
 end
diff --git a/activesupport/lib/active_support/core_ext/object/duplicable.rb b/activesupport/lib/active_support/core_ext/object/duplicable.rb
index 1722726ca2..a2d4d50076 100644
--- a/activesupport/lib/active_support/core_ext/object/duplicable.rb
+++ b/activesupport/lib/active_support/core_ext/object/duplicable.rb
@@ -1,6 +1,6 @@
 class Object
   # Can you safely .dup this object?
-  # False for nil, false, true, symbols, numbers, and class objects; true otherwise.
+  # False for nil, false, true, symbols, numbers, class and module objects; true otherwise.
   def duplicable?
     true
   end
@@ -41,3 +41,9 @@ class Class #:nodoc:
     false
   end
 end
+
+class Module #:nodoc:
+  def duplicable?
+    false
+  end
+end
diff --git a/activesupport/lib/active_support/core_ext/regexp.rb b/activesupport/lib/active_support/core_ext/regexp.rb
index 95d06ee6ee..784145f5fb 100644
--- a/activesupport/lib/active_support/core_ext/regexp.rb
+++ b/activesupport/lib/active_support/core_ext/regexp.rb
@@ -1,27 +1,5 @@
 class Regexp #:nodoc:
-  def number_of_captures
-    Regexp.new("|#{source}").match('').captures.length
-  end
-
   def multiline?
     options & MULTILINE == MULTILINE
   end
-
-  class << self
-    def optionalize(pattern)
-      return pattern if pattern == ""
-
-      case unoptionalize(pattern)
-        when /\A(.|\(.*\))\Z/ then "#{pattern}?"
-        else "(?:#{pattern})?"
-      end
-    end
-
-    def unoptionalize(pattern)
-      [/\A\(\?:(.*)\)\?\Z/, /\A(.|\(.*\))\?\Z/].each do |regexp|
-        return $1 if regexp =~ pattern
-      end
-      return pattern
-    end
-  end
 end
diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
new file mode 100644
index 0000000000..9eae3bebe2
--- /dev/null
+++ b/activesupport/lib/active_support/notifications.rb
@@ -0,0 +1,191 @@
+require 'thread'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/module/attribute_accessors'
+require 'active_support/secure_random'
+
+module ActiveSupport
+  # Notifications provides an instrumentation API for Ruby. To instrument an
+  # action in Ruby you just need to do:
+  #
+  #   ActiveSupport::Notifications.instrument(:render, :extra => :information) do
+  #     render :text => "Foo"
+  #   end
+  #
+  # You can consume those events and the information they provide by registering
+  # a subscriber. For instance, let's store all instrumented events in an array:
+  #
+  #   @events = []
+  #
+  #   ActiveSupport::Notifications.subscribe do |*args|
+  #     @events << ActiveSupport::Notifications::Event.new(*args)
+  #   end
+  #
+  #   ActiveSupport::Notifications.instrument(:render, :extra => :information) do
+  #     render :text => "Foo"
+  #   end
+  #
+  #   event = @events.first
+  #   event.name      #=> :render
+  #   event.duration  #=> 10 (in miliseconds)
+  #   event.result    #=> "Foo"
+  #   event.payload   #=> { :extra => :information }
+  #
+  # When subscribing to Notifications, you can pass a pattern, to only consume
+  # events that match the pattern:
+  #
+  #   ActiveSupport::Notifications.subscribe(/render/) do |event|
+  #     @render_events << event
+  #   end
+  #
+  # Notifications ships with a queue implementation that consumes and publish events
+  # to subscribers in a thread. You can use any queue implementation you want.
+  #
+  module Notifications
+    mattr_accessor :queue
+
+    class << self
+      delegate :instrument, :transaction_id, :transaction, :to => :instrumenter
+
+      def instrumenter
+        Thread.current[:notifications_instrumeter] ||= Instrumenter.new(publisher)
+      end
+
+      def publisher
+        @publisher ||= Publisher.new(queue)
+      end
+
+      def subscribe(pattern=nil, &block)
+        Subscriber.new(queue).bind(pattern).subscribe(&block)
+      end
+    end
+
+    class Instrumenter
+      def initialize(publisher)
+        @publisher = publisher
+        @id        = random_id
+      end
+
+      def transaction
+        @id, old_id = random_id, @id
+        yield
+      ensure
+        @id = old_id
+      end
+
+      def transaction_id
+        @id
+      end
+
+      def instrument(name, payload={})
+        time   = Time.now
+        result = yield if block_given?
+      ensure
+        @publisher.publish(name, time, Time.now, result, @id, payload)
+      end
+
+    private
+      def random_id
+        SecureRandom.hex(10)
+      end
+    end
+
+    class Publisher
+      def initialize(queue)
+        @queue = queue
+      end
+
+      def publish(*args)
+        @queue.publish(*args)
+      end
+    end
+
+    class Subscriber
+      def initialize(queue)
+        @queue = queue
+      end
+
+      def bind(pattern)
+        @pattern = pattern
+        self
+      end
+
+      def subscribe
+        @queue.subscribe(@pattern) do |*args|
+          yield *args
+        end
+      end
+    end
+
+    class Event
+      attr_reader :name, :time, :end, :transaction_id, :result, :payload
+
+      def initialize(name, start, ending, result, transaction_id, payload)
+        @name           = name
+        @payload        = payload.dup
+        @time           = start
+        @transaction_id = transaction_id
+        @end            = ending
+        @result         = result
+      end
+
+      def duration
+        @duration ||= 1000.0 * (@end - @time)
+      end
+
+      def parent_of?(event)
+        start = (self.time - event.time) * 1000
+        start <= 0 && (start + duration >= event.duration)
+      end
+    end
+
+    # This is a default queue implementation that ships with Notifications. It
+    # consumes events in a thread and publish them to all registered subscribers.
+    #
+    class LittleFanout
+      def initialize
+        @listeners = []
+        @stream    = Queue.new
+        Thread.new { consume }
+      end
+
+      def publish(*args)
+        @stream.push(args)
+      end
+
+      def subscribe(pattern=nil, &block)
+        @listeners << Listener.new(pattern, &block)
+      end
+
+      def consume
+        while args = @stream.shift
+          @listeners.each { |l| l.publish(*args) }
+        end
+      end
+
+      class Listener
+        # attr_reader :thread
+
+        def initialize(pattern, &block)
+          @pattern = pattern
+          @subscriber = block
+          @queue = Queue.new
+          Thread.new { consume }
+        end
+
+        def publish(name, *args)
+          if !@pattern || @pattern === name.to_s
+            @queue << args.unshift(name)
+          end
+        end
+
+        def consume
+          while args = @queue.shift
+            @subscriber.call(*args)
+          end
+        end
+      end
+    end
+  end
+
+  Notifications.queue = Notifications::LittleFanout.new
+end
diff --git a/activesupport/lib/active_support/orchestra.rb b/activesupport/lib/active_support/orchestra.rb
deleted file mode 100644
index efe30669d8..0000000000
--- a/activesupport/lib/active_support/orchestra.rb
+++ /dev/null
@@ -1,103 +0,0 @@
-require 'thread'
-
-module ActiveSupport
-  # Orchestra provides an instrumentation API for Ruby. To instrument an action
-  # in Ruby you just need to:
-  #
-  #   ActiveSupport::Orchestra.instrument(:render, :extra => :information) do
-  #     render :text => "Foo"
-  #   end
-  #
-  # Those actions are consumed by listeners. A listener is anything that responds
-  # to push. You can even register an array:
-  #
-  #   @listener = []
-  #   ActiveSupport::Orchestra.register @listener
-  #
-  #   ActiveSupport::Orchestra.instrument(:render, :extra => :information) do
-  #     render :text => "Foo"
-  #   end
-  #
-  #   event           #=> ActiveSupport::Orchestra::Event
-  #   event.name      #=> :render
-  #   event.duration  #=> 10 (in miliseconds)
-  #   event.result    #=> "Foo"
-  #   event.payload   #=> { :extra => :information }
-  #
-  # Orchestra ships with a default listener implementation which puts events in
-  # a stream and consume them in a Thread. This implementation is thread safe
-  # and is available at ActiveSupport::Orchestra::Listener.
-  #
-  module Orchestra
-    @stacked_events = Hash.new { |h,k| h[k] = [] }
-    @listeners = []
-
-    def self.instrument(name, payload=nil)
-      stack = @stacked_events[Thread.current.object_id]
-      event = Event.new(name, stack.last, payload)
-      stack << event
-      event.result = yield
-      event
-    ensure
-      event.finish!
-      stack.delete(event)
-      @listeners.each { |s| s.push(event) }
-    end
-
-    def self.register(listener)
-      @listeners << listener
-    end
-
-    def self.unregister(listener)
-      @listeners.delete(listener)
-    end
-
-    class Event
-      attr_reader :name, :time, :duration, :parent, :thread_id, :payload
-      attr_accessor :result
-
-      def initialize(name, parent=nil, payload=nil)
-        @name      = name
-        @time      = Time.now
-        @thread_id = Thread.current.object_id
-        @parent    = parent
-        @payload   = payload
-      end
-
-      def finish!
-        @duration = 1000 * (Time.now.to_f - @time.to_f)
-      end
-    end
-
-    class Listener
-      attr_reader :mutex, :signaler, :thread
-
-      def initialize
-        @mutex, @signaler = Mutex.new, ConditionVariable.new
-        @stream = []
-        @thread = Thread.new do
-          loop do
-            (event = @stream.shift) ? consume(event) : wait
-          end
-        end
-      end
-
-      def wait
-        @mutex.synchronize do
-          @signaler.wait(@mutex)
-        end
-      end
-
-      def push(event)
-        @mutex.synchronize do
-          @stream.push(event)
-          @signaler.broadcast
-        end
-      end
-
-      def consume(event)
-        raise NotImplementedError
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 564528bfe2..53a4c7acf5 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -63,7 +63,7 @@ module ActiveSupport
         "Azores"                       => "Atlantic/Azores",
         "Cape Verde Is."               => "Atlantic/Cape_Verde",
         "Dublin"                       => "Europe/Dublin",
-        "Edinburgh"                    => "Europe/Dublin",
+        "Edinburgh"                    => "Europe/London",
         "Lisbon"                       => "Europe/Lisbon",
         "London"                       => "Europe/London",
         "Casablanca"                   => "Africa/Casablanca",
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb
index 9f464c8246..4a711b7e25 100644
--- a/activesupport/lib/active_support/vendor.rb
+++ b/activesupport/lib/active_support/vendor.rb
@@ -1,8 +1,10 @@
+require 'pathname'
+
 def ActiveSupport.requirable?(file)
   $LOAD_PATH.any? { |p| Dir.glob("#{p}/#{file}.*").any? }
 end
 
-[%w(builder 2.1.2), %w(i18n 0.1.3), %w(memcache-client 1.7.5), %w(tzinfo 0.3.13)].each do |lib, version|
+[%w(builder 2.1.2), %w(i18n 0.1.3), %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.
@@ -10,7 +12,8 @@ end
       gem lib, "~> #{version}"
       # Use the vendored lib if the gem's missing or we aren't using RubyGems.
     rescue LoadError, NoMethodError
-      $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/vendor/#{lib}-#{version}/lib")
+      # 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/tzinfo-0.3.13/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
deleted file mode 100644
index 8f4dd31dbb..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
+++ /dev/null
@@ -1,166 +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
-            tz.transition 2009, 10, :o5, 1255834800
-            tz.transition 2010, 3, :o4, 1269136800
-            tz.transition 2010, 10, :o5, 1287284400
-            tz.transition 2011, 3, :o4, 1300586400
-            tz.transition 2011, 10, :o5, 1318734000
-            tz.transition 2012, 3, :o4, 1332036000
-            tz.transition 2012, 10, :o5, 1350788400
-            tz.transition 2013, 3, :o4, 1363485600
-            tz.transition 2013, 10, :o5, 1382238000
-            tz.transition 2014, 3, :o4, 1394935200
-            tz.transition 2014, 10, :o5, 1413687600
-            tz.transition 2015, 3, :o4, 1426384800
-            tz.transition 2015, 10, :o5, 1445137200
-            tz.transition 2016, 3, :o4, 1458439200
-            tz.transition 2016, 10, :o5, 1476586800
-            tz.transition 2017, 3, :o4, 1489888800
-            tz.transition 2017, 10, :o5, 1508036400
-            tz.transition 2018, 3, :o4, 1521338400
-            tz.transition 2018, 10, :o5, 1540090800
-            tz.transition 2019, 3, :o4, 1552788000
-            tz.transition 2019, 10, :o5, 1571540400
-            tz.transition 2020, 3, :o4, 1584237600
-            tz.transition 2020, 10, :o5, 1602990000
-            tz.transition 2021, 3, :o4, 1616292000
-            tz.transition 2021, 10, :o5, 1634439600
-            tz.transition 2022, 3, :o4, 1647741600
-            tz.transition 2022, 10, :o5, 1665889200
-            tz.transition 2023, 3, :o4, 1679191200
-            tz.transition 2023, 10, :o5, 1697338800
-            tz.transition 2024, 3, :o4, 1710640800
-            tz.transition 2024, 10, :o5, 1729393200
-            tz.transition 2025, 3, :o4, 1742090400
-            tz.transition 2025, 10, :o5, 1760842800
-            tz.transition 2026, 3, :o4, 1773540000
-            tz.transition 2026, 10, :o5, 1792292400
-            tz.transition 2027, 3, :o4, 1805594400
-            tz.transition 2027, 10, :o5, 1823742000
-            tz.transition 2028, 3, :o4, 1837044000
-            tz.transition 2028, 10, :o5, 1855191600
-            tz.transition 2029, 3, :o4, 1868493600
-            tz.transition 2029, 10, :o5, 1887246000
-            tz.transition 2030, 3, :o4, 1899943200
-            tz.transition 2030, 10, :o5, 1918695600
-            tz.transition 2031, 3, :o4, 1931392800
-            tz.transition 2031, 10, :o5, 1950145200
-            tz.transition 2032, 3, :o4, 1963447200
-            tz.transition 2032, 10, :o5, 1981594800
-            tz.transition 2033, 3, :o4, 1994896800
-            tz.transition 2033, 10, :o5, 2013044400
-            tz.transition 2034, 3, :o4, 2026346400
-            tz.transition 2034, 10, :o5, 2044494000
-            tz.transition 2035, 3, :o4, 2057796000
-            tz.transition 2035, 10, :o5, 2076548400
-            tz.transition 2036, 3, :o4, 2089245600
-            tz.transition 2036, 10, :o5, 2107998000
-            tz.transition 2037, 3, :o4, 2120695200
-            tz.transition 2037, 10, :o5, 2139447600
-            tz.transition 2038, 3, :o4, 29586043, 12
-            tz.transition 2038, 10, :o5, 19725709, 8
-            tz.transition 2039, 3, :o4, 29590411, 12
-            tz.transition 2039, 10, :o5, 19728621, 8
-            tz.transition 2040, 3, :o4, 29594779, 12
-            tz.transition 2040, 10, :o5, 19731589, 8
-            tz.transition 2041, 3, :o4, 29599147, 12
-            tz.transition 2041, 10, :o5, 19734501, 8
-            tz.transition 2042, 3, :o4, 29603515, 12
-            tz.transition 2042, 10, :o5, 19737413, 8
-            tz.transition 2043, 3, :o4, 29607883, 12
-            tz.transition 2043, 10, :o5, 19740325, 8
-            tz.transition 2044, 3, :o4, 29612335, 12
-            tz.transition 2044, 10, :o5, 19743237, 8
-            tz.transition 2045, 3, :o4, 29616703, 12
-            tz.transition 2045, 10, :o5, 19746149, 8
-            tz.transition 2046, 3, :o4, 29621071, 12
-            tz.transition 2046, 10, :o5, 19749117, 8
-            tz.transition 2047, 3, :o4, 29625439, 12
-            tz.transition 2047, 10, :o5, 19752029, 8
-            tz.transition 2048, 3, :o4, 29629807, 12
-            tz.transition 2048, 10, :o5, 19754941, 8
-            tz.transition 2049, 3, :o4, 29634259, 12
-            tz.transition 2049, 10, :o5, 19757853, 8
-            tz.transition 2050, 3, :o4, 29638627, 12
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Karachi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Karachi.rb
deleted file mode 100644
index 4f187b4ad4..0000000000
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Karachi.rb
+++ /dev/null
@@ -1,32 +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
-        end
-      end
-    end
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo.rb
index c8bdbeec5d..c8bdbeec5d 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/data_timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/data_timezone.rb
index 5eccbdf0db..5eccbdf0db 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/data_timezone.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/data_timezone.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/data_timezone_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/data_timezone_info.rb
index a45d94554b..a45d94554b 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/data_timezone_info.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/data_timezone_info.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Algiers.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Algiers.rb
index 8c5f25577f..8c5f25577f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Algiers.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Algiers.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Cairo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Cairo.rb
index 6e6daf3522..b7ed8e8244 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Cairo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Cairo.rb
@@ -129,89 +129,89 @@ module TZInfo
           tz.transition 2008, 4, :o2, 1209074400
           tz.transition 2008, 8, :o1, 1219957200
           tz.transition 2009, 4, :o2, 1240524000
-          tz.transition 2009, 8, :o1, 1251406800
+          tz.transition 2009, 8, :o1, 1250802000
           tz.transition 2010, 4, :o2, 1272578400
-          tz.transition 2010, 8, :o1, 1282856400
+          tz.transition 2010, 9, :o1, 1285880400
           tz.transition 2011, 4, :o2, 1304028000
-          tz.transition 2011, 8, :o1, 1314306000
+          tz.transition 2011, 9, :o1, 1317330000
           tz.transition 2012, 4, :o2, 1335477600
-          tz.transition 2012, 8, :o1, 1346360400
+          tz.transition 2012, 9, :o1, 1348779600
           tz.transition 2013, 4, :o2, 1366927200
-          tz.transition 2013, 8, :o1, 1377810000
+          tz.transition 2013, 9, :o1, 1380229200
           tz.transition 2014, 4, :o2, 1398376800
-          tz.transition 2014, 8, :o1, 1409259600
+          tz.transition 2014, 9, :o1, 1411678800
           tz.transition 2015, 4, :o2, 1429826400
-          tz.transition 2015, 8, :o1, 1440709200
+          tz.transition 2015, 9, :o1, 1443128400
           tz.transition 2016, 4, :o2, 1461880800
-          tz.transition 2016, 8, :o1, 1472158800
+          tz.transition 2016, 9, :o1, 1475182800
           tz.transition 2017, 4, :o2, 1493330400
-          tz.transition 2017, 8, :o1, 1504213200
+          tz.transition 2017, 9, :o1, 1506632400
           tz.transition 2018, 4, :o2, 1524780000
-          tz.transition 2018, 8, :o1, 1535662800
+          tz.transition 2018, 9, :o1, 1538082000
           tz.transition 2019, 4, :o2, 1556229600
-          tz.transition 2019, 8, :o1, 1567112400
+          tz.transition 2019, 9, :o1, 1569531600
           tz.transition 2020, 4, :o2, 1587679200
-          tz.transition 2020, 8, :o1, 1598562000
+          tz.transition 2020, 9, :o1, 1600981200
           tz.transition 2021, 4, :o2, 1619733600
-          tz.transition 2021, 8, :o1, 1630011600
+          tz.transition 2021, 9, :o1, 1633035600
           tz.transition 2022, 4, :o2, 1651183200
-          tz.transition 2022, 8, :o1, 1661461200
+          tz.transition 2022, 9, :o1, 1664485200
           tz.transition 2023, 4, :o2, 1682632800
-          tz.transition 2023, 8, :o1, 1693515600
+          tz.transition 2023, 9, :o1, 1695934800
           tz.transition 2024, 4, :o2, 1714082400
-          tz.transition 2024, 8, :o1, 1724965200
+          tz.transition 2024, 9, :o1, 1727384400
           tz.transition 2025, 4, :o2, 1745532000
-          tz.transition 2025, 8, :o1, 1756414800
+          tz.transition 2025, 9, :o1, 1758834000
           tz.transition 2026, 4, :o2, 1776981600
-          tz.transition 2026, 8, :o1, 1787864400
+          tz.transition 2026, 9, :o1, 1790283600
           tz.transition 2027, 4, :o2, 1809036000
-          tz.transition 2027, 8, :o1, 1819314000
+          tz.transition 2027, 9, :o1, 1822338000
           tz.transition 2028, 4, :o2, 1840485600
-          tz.transition 2028, 8, :o1, 1851368400
+          tz.transition 2028, 9, :o1, 1853787600
           tz.transition 2029, 4, :o2, 1871935200
-          tz.transition 2029, 8, :o1, 1882818000
+          tz.transition 2029, 9, :o1, 1885237200
           tz.transition 2030, 4, :o2, 1903384800
-          tz.transition 2030, 8, :o1, 1914267600
+          tz.transition 2030, 9, :o1, 1916686800
           tz.transition 2031, 4, :o2, 1934834400
-          tz.transition 2031, 8, :o1, 1945717200
+          tz.transition 2031, 9, :o1, 1948136400
           tz.transition 2032, 4, :o2, 1966888800
-          tz.transition 2032, 8, :o1, 1977166800
+          tz.transition 2032, 9, :o1, 1980190800
           tz.transition 2033, 4, :o2, 1998338400
-          tz.transition 2033, 8, :o1, 2008616400
+          tz.transition 2033, 9, :o1, 2011640400
           tz.transition 2034, 4, :o2, 2029788000
-          tz.transition 2034, 8, :o1, 2040670800
+          tz.transition 2034, 9, :o1, 2043090000
           tz.transition 2035, 4, :o2, 2061237600
-          tz.transition 2035, 8, :o1, 2072120400
+          tz.transition 2035, 9, :o1, 2074539600
           tz.transition 2036, 4, :o2, 2092687200
-          tz.transition 2036, 8, :o1, 2103570000
+          tz.transition 2036, 9, :o1, 2105989200
           tz.transition 2037, 4, :o2, 2124136800
-          tz.transition 2037, 8, :o1, 2135019600
+          tz.transition 2037, 9, :o1, 2137438800
           tz.transition 2038, 4, :o2, 29586521, 12
-          tz.transition 2038, 8, :o1, 19725299, 8
+          tz.transition 2038, 9, :o1, 19725579, 8
           tz.transition 2039, 4, :o2, 29590889, 12
-          tz.transition 2039, 8, :o1, 19728211, 8
+          tz.transition 2039, 9, :o1, 19728491, 8
           tz.transition 2040, 4, :o2, 29595257, 12
-          tz.transition 2040, 8, :o1, 19731179, 8
+          tz.transition 2040, 9, :o1, 19731403, 8
           tz.transition 2041, 4, :o2, 29599625, 12
-          tz.transition 2041, 8, :o1, 19734091, 8
+          tz.transition 2041, 9, :o1, 19734315, 8
           tz.transition 2042, 4, :o2, 29603993, 12
-          tz.transition 2042, 8, :o1, 19737003, 8
+          tz.transition 2042, 9, :o1, 19737227, 8
           tz.transition 2043, 4, :o2, 29608361, 12
-          tz.transition 2043, 8, :o1, 19739915, 8
+          tz.transition 2043, 9, :o1, 19740139, 8
           tz.transition 2044, 4, :o2, 29612813, 12
-          tz.transition 2044, 8, :o1, 19742827, 8
+          tz.transition 2044, 9, :o1, 19743107, 8
           tz.transition 2045, 4, :o2, 29617181, 12
-          tz.transition 2045, 8, :o1, 19745795, 8
+          tz.transition 2045, 9, :o1, 19746019, 8
           tz.transition 2046, 4, :o2, 29621549, 12
-          tz.transition 2046, 8, :o1, 19748707, 8
+          tz.transition 2046, 9, :o1, 19748931, 8
           tz.transition 2047, 4, :o2, 29625917, 12
-          tz.transition 2047, 8, :o1, 19751619, 8
+          tz.transition 2047, 9, :o1, 19751843, 8
           tz.transition 2048, 4, :o2, 29630285, 12
-          tz.transition 2048, 8, :o1, 19754531, 8
+          tz.transition 2048, 9, :o1, 19754755, 8
           tz.transition 2049, 4, :o2, 29634737, 12
-          tz.transition 2049, 8, :o1, 19757443, 8
+          tz.transition 2049, 9, :o1, 19757723, 8
           tz.transition 2050, 4, :o2, 29639105, 12
-          tz.transition 2050, 8, :o1, 19760355, 8
+          tz.transition 2050, 9, :o1, 19760635, 8
         end
       end
     end
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Casablanca.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Casablanca.rb
index 18d73c93a0..18d73c93a0 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Casablanca.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Casablanca.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Harare.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Harare.rb
index 070c95ae0f..070c95ae0f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Harare.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Harare.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Johannesburg.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Johannesburg.rb
index f0af0d8e33..f0af0d8e33 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Johannesburg.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Johannesburg.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Monrovia.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Monrovia.rb
index 40e711fa44..40e711fa44 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Monrovia.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Monrovia.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Nairobi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Nairobi.rb
index 7b0a2f43be..7b0a2f43be 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Africa/Nairobi.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Africa/Nairobi.rb
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
new file mode 100644
index 0000000000..307f9546de
--- /dev/null
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Argentina/Buenos_Aires.rb
@@ -0,0 +1,84 @@
+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.13/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
index ba8be4705f..ba8be4705f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/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
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Bogota.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Bogota.rb
index ef96435c6a..ef96435c6a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Bogota.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Bogota.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Caracas.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Caracas.rb
index 27392a540a..27392a540a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Caracas.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Caracas.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Chicago.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Chicago.rb
index 0996857cf0..0996857cf0 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Chicago.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Chicago.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Chihuahua.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Chihuahua.rb
index 1710b57c79..1710b57c79 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Chihuahua.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Chihuahua.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Denver.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Denver.rb
index 1c1efb5ff3..1c1efb5ff3 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Denver.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Denver.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Godthab.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Godthab.rb
index 1e05518b0d..1e05518b0d 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Godthab.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Godthab.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Guatemala.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Guatemala.rb
index a2bf73401c..a2bf73401c 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Guatemala.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Guatemala.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Halifax.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Halifax.rb
index d25ae775b3..d25ae775b3 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Halifax.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Halifax.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb
index f1430f6c24..f1430f6c24 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Indiana/Indianapolis.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Juneau.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Juneau.rb
index f646f3f54a..f646f3f54a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Juneau.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Juneau.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/La_Paz.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/La_Paz.rb
index 45c907899f..45c907899f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/La_Paz.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/La_Paz.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Lima.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Lima.rb
index af68ac29f7..af68ac29f7 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Lima.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Lima.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Los_Angeles.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Los_Angeles.rb
index 16007fd675..16007fd675 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Los_Angeles.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Los_Angeles.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Mazatlan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Mazatlan.rb
index ba9e6efcf1..ba9e6efcf1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Mazatlan.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Mazatlan.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Mexico_City.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Mexico_City.rb
index 2347fce647..2347fce647 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Mexico_City.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Mexico_City.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Monterrey.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Monterrey.rb
index 5816a9eab1..5816a9eab1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Monterrey.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Monterrey.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/New_York.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/New_York.rb
index 7d802bd2de..7d802bd2de 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/New_York.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/New_York.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Phoenix.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Phoenix.rb
index b514e0c0f9..b514e0c0f9 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Phoenix.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Phoenix.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Regina.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Regina.rb
index ebdb68814a..ebdb68814a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Regina.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Regina.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Santiago.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Santiago.rb
index 0287c9ebc4..0287c9ebc4 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Santiago.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Santiago.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Sao_Paulo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Sao_Paulo.rb
index 0524f81c04..0524f81c04 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Sao_Paulo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Sao_Paulo.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/St_Johns.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/St_Johns.rb
index e4a3599d35..e4a3599d35 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/St_Johns.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/St_Johns.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Tijuana.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Tijuana.rb
index 423059da46..423059da46 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/America/Tijuana.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/America/Tijuana.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Almaty.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Almaty.rb
index 9ee18970f1..9ee18970f1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Almaty.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Almaty.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Baghdad.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Baghdad.rb
index 774dca1587..774dca1587 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Baghdad.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Baghdad.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Baku.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Baku.rb
index e86340ebfa..e86340ebfa 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Baku.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Baku.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Bangkok.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Bangkok.rb
index 139194e5e5..139194e5e5 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Bangkok.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Bangkok.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Chongqing.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Chongqing.rb
index 8c94b4ba86..8c94b4ba86 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Chongqing.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Chongqing.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Colombo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Colombo.rb
index f6531fa819..f6531fa819 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Colombo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Colombo.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Dhaka.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Dhaka.rb
index ccd0265503..46dce9a0d0 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Dhaka.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Dhaka.rb
@@ -13,6 +13,7 @@ module TZInfo
           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
@@ -20,6 +21,7 @@ module TZInfo
           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
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Hong_Kong.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Hong_Kong.rb
index f1edd75ac8..f1edd75ac8 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Hong_Kong.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Hong_Kong.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Irkutsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Irkutsk.rb
index 2d47d9580b..2d47d9580b 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Irkutsk.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Irkutsk.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Jakarta.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Jakarta.rb
index cc58fa173b..cc58fa173b 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Jakarta.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Jakarta.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Jerusalem.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Jerusalem.rb
index 9b737b899e..9b737b899e 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Jerusalem.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Jerusalem.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kabul.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kabul.rb
index 669c09790a..669c09790a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kabul.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kabul.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kamchatka.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kamchatka.rb
index 2f1690b3a9..2f1690b3a9 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kamchatka.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kamchatka.rb
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
new file mode 100644
index 0000000000..dfe02c5cf6
--- /dev/null
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Karachi.rb
@@ -0,0 +1,114 @@
+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.13/lib/tzinfo/definitions/Asia/Kathmandu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kathmandu.rb
index 37b241612e..37b241612e 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kathmandu.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kathmandu.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kolkata.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kolkata.rb
index 1b6ffbd59d..1b6ffbd59d 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kolkata.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kolkata.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb
index d6c503c155..d6c503c155 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Krasnoyarsk.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb
index 77a0c206fa..77a0c206fa 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kuala_Lumpur.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kuwait.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kuwait.rb
index 5bd5283197..5bd5283197 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Kuwait.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Kuwait.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Magadan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Magadan.rb
index 302093693e..302093693e 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Magadan.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Magadan.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Muscat.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Muscat.rb
index 604f651dfa..604f651dfa 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Muscat.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Muscat.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Novosibirsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Novosibirsk.rb
index a4e7796e75..a4e7796e75 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Novosibirsk.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Novosibirsk.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Rangoon.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Rangoon.rb
index 759b82d77a..759b82d77a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Rangoon.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Rangoon.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Riyadh.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Riyadh.rb
index 7add410620..7add410620 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Riyadh.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Riyadh.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Seoul.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Seoul.rb
index 795d2a75df..795d2a75df 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Seoul.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Seoul.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Shanghai.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Shanghai.rb
index 34b13d59ae..34b13d59ae 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Shanghai.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Shanghai.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Singapore.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Singapore.rb
index b323a78f74..b323a78f74 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Singapore.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Singapore.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Taipei.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Taipei.rb
index 3ba12108fb..3ba12108fb 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Taipei.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Taipei.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tashkent.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tashkent.rb
index c205c7934d..c205c7934d 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tashkent.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tashkent.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tbilisi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tbilisi.rb
index 15792a5651..15792a5651 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tbilisi.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tbilisi.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tehran.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tehran.rb
index d8df964a46..d8df964a46 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tehran.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tehran.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tokyo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tokyo.rb
index 51c9e16421..51c9e16421 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Tokyo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Tokyo.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb
index 2854f5c5fd..2854f5c5fd 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Ulaanbaatar.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Urumqi.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Urumqi.rb
index d793ff1341..d793ff1341 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Urumqi.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Urumqi.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Vladivostok.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Vladivostok.rb
index bd9e3d60ec..bd9e3d60ec 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Vladivostok.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Vladivostok.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Yakutsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yakutsk.rb
index 56435a788f..56435a788f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Yakutsk.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yakutsk.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Yekaterinburg.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yekaterinburg.rb
index 8ef8df4a41..8ef8df4a41 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Yekaterinburg.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yekaterinburg.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Yerevan.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yerevan.rb
index e7f160861f..e7f160861f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Asia/Yerevan.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Asia/Yerevan.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Atlantic/Azores.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/Azores.rb
index 1bd16a75ac..1bd16a75ac 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Atlantic/Azores.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/Azores.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb
index 61c8c15043..61c8c15043 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/Cape_Verde.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Atlantic/South_Georgia.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/South_Georgia.rb
index 6a4cbafb9f..6a4cbafb9f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Atlantic/South_Georgia.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Atlantic/South_Georgia.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Adelaide.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Adelaide.rb
index c5d561cc1e..c5d561cc1e 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Adelaide.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Adelaide.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Brisbane.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Brisbane.rb
index dd85ddae94..dd85ddae94 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Brisbane.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Brisbane.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Darwin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Darwin.rb
index 17de88124d..17de88124d 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Darwin.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Darwin.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Hobart.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Hobart.rb
index 11384b9840..11384b9840 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Hobart.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Hobart.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Melbourne.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Melbourne.rb
index c1304488ea..c1304488ea 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Melbourne.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Melbourne.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Perth.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Perth.rb
index d9e66f14a8..d9e66f14a8 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Perth.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Perth.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Sydney.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Sydney.rb
index 9062bd7c3c..9062bd7c3c 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Australia/Sydney.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Australia/Sydney.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Etc/UTC.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Etc/UTC.rb
index 28b2c6a04c..28b2c6a04c 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Etc/UTC.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Etc/UTC.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Amsterdam.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Amsterdam.rb
index 2d0c95c4bc..2d0c95c4bc 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Amsterdam.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Amsterdam.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Athens.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Athens.rb
index 4e21e535ca..4e21e535ca 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Athens.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Athens.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Belgrade.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Belgrade.rb
index 4dbd893d75..4dbd893d75 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Belgrade.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Belgrade.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Berlin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Berlin.rb
index 721054236c..721054236c 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Berlin.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Berlin.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Bratislava.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Bratislava.rb
index 7a731a0b6a..7a731a0b6a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Bratislava.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Bratislava.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Brussels.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Brussels.rb
index 6b0a242944..6b0a242944 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Brussels.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Brussels.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Bucharest.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Bucharest.rb
index 521c3c932e..521c3c932e 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Bucharest.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Bucharest.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Budapest.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Budapest.rb
index 1f3a9738b7..1f3a9738b7 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Budapest.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Budapest.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Copenhagen.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Copenhagen.rb
index 47cbaf14a7..47cbaf14a7 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Copenhagen.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Copenhagen.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Dublin.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Dublin.rb
index 0560bb5436..0560bb5436 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Dublin.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Dublin.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Helsinki.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Helsinki.rb
index 13a806bcc7..13a806bcc7 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Helsinki.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Helsinki.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Istanbul.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Istanbul.rb
index 8306c47536..8306c47536 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Istanbul.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Istanbul.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Kiev.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Kiev.rb
index 513d3308be..513d3308be 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Kiev.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Kiev.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Lisbon.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Lisbon.rb
index 1c6d2a3d30..1c6d2a3d30 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Lisbon.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Lisbon.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Ljubljana.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Ljubljana.rb
index a9828e6ef8..a9828e6ef8 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Ljubljana.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Ljubljana.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/London.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/London.rb
index 64ce41e900..64ce41e900 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/London.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/London.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Madrid.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Madrid.rb
index 1fb568239a..1fb568239a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Madrid.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Madrid.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Minsk.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Minsk.rb
index fa15816cc8..fa15816cc8 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Minsk.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Minsk.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Moscow.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Moscow.rb
index ef269b675b..ef269b675b 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Moscow.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Moscow.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Paris.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Paris.rb
index e3236c0ba1..e3236c0ba1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Paris.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Paris.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Prague.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Prague.rb
index bcabee96c1..bcabee96c1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Prague.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Prague.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Riga.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Riga.rb
index 784837f758..784837f758 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Riga.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Riga.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Rome.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Rome.rb
index aa7b43d9d2..aa7b43d9d2 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Rome.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Rome.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Sarajevo.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Sarajevo.rb
index 068c5fe6ad..068c5fe6ad 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Sarajevo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Sarajevo.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Skopje.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Skopje.rb
index 10b71f285e..10b71f285e 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Skopje.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Skopje.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Sofia.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Sofia.rb
index 38a70eceb9..38a70eceb9 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Sofia.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Sofia.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Stockholm.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Stockholm.rb
index 43db70fa61..43db70fa61 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Stockholm.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Stockholm.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Tallinn.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Tallinn.rb
index de5a8569f3..de5a8569f3 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Tallinn.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Tallinn.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Vienna.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Vienna.rb
index 990aabab66..990aabab66 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Vienna.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Vienna.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Vilnius.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Vilnius.rb
index d89d095a75..d89d095a75 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Vilnius.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Vilnius.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Warsaw.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Warsaw.rb
index 7fa51c2691..7fa51c2691 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Warsaw.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Warsaw.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Zagreb.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Zagreb.rb
index ecdd903d28..ecdd903d28 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Europe/Zagreb.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Europe/Zagreb.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Auckland.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Auckland.rb
index a524fd6b6b..a524fd6b6b 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Auckland.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Auckland.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Fiji.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Fiji.rb
index 5fe9bbd9a6..5fe9bbd9a6 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Fiji.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Fiji.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Guam.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Guam.rb
index d4c1a0a682..d4c1a0a682 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Guam.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Guam.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Honolulu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Honolulu.rb
index 204b226537..204b226537 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Honolulu.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Honolulu.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Majuro.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Majuro.rb
index 32adad92c1..32adad92c1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Majuro.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Majuro.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Midway.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Midway.rb
index 97784fcc10..97784fcc10 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Midway.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Midway.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Noumea.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Noumea.rb
index 70173db8ab..70173db8ab 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Noumea.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Noumea.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Pago_Pago.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Pago_Pago.rb
index c8fcd7d527..c8fcd7d527 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Pago_Pago.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Pago_Pago.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Port_Moresby.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Port_Moresby.rb
index f06cf6d54f..f06cf6d54f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Port_Moresby.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Port_Moresby.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Tongatapu.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Tongatapu.rb
index 7578d92f38..7578d92f38 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/definitions/Pacific/Tongatapu.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/definitions/Pacific/Tongatapu.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/info_timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/info_timezone.rb
index 001303c594..001303c594 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/info_timezone.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/info_timezone.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/linked_timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/linked_timezone.rb
index f8ec4fca87..f8ec4fca87 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/linked_timezone.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/linked_timezone.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/linked_timezone_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/linked_timezone_info.rb
index 8197ff3e81..8197ff3e81 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/linked_timezone_info.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/linked_timezone_info.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/offset_rationals.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/offset_rationals.rb
index b1f10b2b63..b1f10b2b63 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/offset_rationals.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/offset_rationals.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/ruby_core_support.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/ruby_core_support.rb
index b65eeaaae7..9a0441206b 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/ruby_core_support.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/ruby_core_support.rb
@@ -1,56 +1,56 @@
-#--
-# 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
+#--

+# 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.13/lib/tzinfo/time_or_datetime.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/time_or_datetime.rb
index 264517f3ee..264517f3ee 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/time_or_datetime.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/time_or_datetime.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone.rb
index ef4ecd8ae1..ef4ecd8ae1 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_definition.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_definition.rb
index 39ca8bfa53..39ca8bfa53 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_definition.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_definition.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_info.rb
index 68e38c35fb..68e38c35fb 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_info.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_info.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_offset_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_offset_info.rb
index 6a0bbca46f..6a0bbca46f 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_offset_info.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_offset_info.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_period.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_period.rb
index 00888fcfdc..00888fcfdc 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_period.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_period.rb
diff --git a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_transition_info.rb b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_transition_info.rb
index 6b0669cc4a..6b0669cc4a 100644
--- a/activesupport/lib/active_support/vendor/tzinfo-0.3.13/lib/tzinfo/timezone_transition_info.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo-0.3.15/lib/tzinfo/timezone_transition_info.rb
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index af9656615c..f390c66838 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -1,4 +1,12 @@
 ORIG_ARGV = ARGV.dup
+root = File.expand_path('../../..', __FILE__)
+begin
+  require "#{root}/vendor/gems/environment"
+rescue LoadError
+  $:.unshift("#{root}/activesupport/lib")
+  $:.unshift("#{root}/activerecord/lib")
+end
+
 
 require 'test/unit'
 
@@ -11,7 +19,6 @@ rescue LoadError
 end
 
 ENV['NO_RELOAD'] = '1'
-$:.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'active_support'
 require 'active_support/test_case'
 
diff --git a/activesupport/test/benchmarkable_test.rb b/activesupport/test/benchmarkable_test.rb
new file mode 100644
index 0000000000..766956f50f
--- /dev/null
+++ b/activesupport/test/benchmarkable_test.rb
@@ -0,0 +1,86 @@
+require 'abstract_unit'
+
+class BenchmarkableTest < ActiveSupport::TestCase
+  include ActiveSupport::Benchmarkable
+
+  def teardown
+    logger.send(:clear_buffer)
+  end
+
+  def test_without_block
+    assert_raise(LocalJumpError) { benchmark }
+    assert buffer.empty?
+  end
+
+  def test_defaults
+    i_was_run = false
+    benchmark { i_was_run = true }
+    assert i_was_run
+    assert_last_logged
+  end
+
+  def test_with_message
+    i_was_run = false
+    benchmark('test_run') { i_was_run = true }
+    assert i_was_run
+    assert_last_logged 'test_run'
+  end
+
+  def test_with_message_and_deprecated_level
+    i_was_run = false
+
+    assert_deprecated do
+      benchmark('debug_run', :debug) { i_was_run = true }
+    end
+
+    assert i_was_run
+    assert_last_logged 'debug_run'
+  end
+
+  def test_within_level
+    logger.level = ActiveSupport::BufferedLogger::DEBUG
+    benchmark('included_debug_run', :level => :debug) { }
+    assert_last_logged 'included_debug_run'
+  end
+
+  def test_outside_level
+    logger.level = ActiveSupport::BufferedLogger::ERROR
+    benchmark('skipped_debug_run', :level => :debug) { }
+    assert_no_match(/skipped_debug_run/, buffer.last)
+  ensure
+    logger.level = ActiveSupport::BufferedLogger::DEBUG
+  end
+
+  def test_without_silencing
+    benchmark('debug_run', :silence => false) do
+      logger.info "not silenced!"
+    end
+
+    assert_equal 2, buffer.size
+  end
+
+  def test_with_silencing
+    benchmark('debug_run', :silence => true) do
+      logger.info "silenced!"
+    end
+
+    assert_equal 1, buffer.size
+  end
+
+  private
+    def logger
+      @logger ||= begin
+        logger = ActiveSupport::BufferedLogger.new(StringIO.new)
+        logger.auto_flushing = false
+        logger
+      end
+    end
+
+    def buffer
+      logger.send(:buffer)
+    end
+
+    def assert_last_logged(message = 'Benchmarking')
+      assert_match(/^#{message} \(.*\)$/, buffer.last)
+    end
+end
diff --git a/activesupport/test/core_ext/class/delegating_attributes_test.rb b/activesupport/test/core_ext/class/delegating_attributes_test.rb
index b51d68551d..beb55ba17e 100644
--- a/activesupport/test/core_ext/class/delegating_attributes_test.rb
+++ b/activesupport/test/core_ext/class/delegating_attributes_test.rb
@@ -52,6 +52,13 @@ class DelegatingAttributesTest < Test::Unit::TestCase
     assert !single_class.public_instance_methods.map(&:to_s).include?("both=")
   end
 
+  def test_simple_accessor_declaration_with_instance_reader_false
+    single_class.superclass_delegating_accessor :no_instance_reader, :instance_reader => false
+    assert single_class.respond_to?(:no_instance_reader)
+    assert single_class.respond_to?(:no_instance_reader=)
+    assert !single_class.public_instance_methods.map(&:to_s).include?("no_instance_reader")
+  end
+
   def test_working_with_simple_attributes
     single_class.superclass_delegating_accessor :both
 
diff --git a/activesupport/test/core_ext/regexp_ext_test.rb b/activesupport/test/core_ext/regexp_ext_test.rb
index cc3f07d5c5..68b089d5b4 100644
--- a/activesupport/test/core_ext/regexp_ext_test.rb
+++ b/activesupport/test/core_ext/regexp_ext_test.rb
@@ -2,28 +2,9 @@ require 'abstract_unit'
 require 'active_support/core_ext/regexp'
 
 class RegexpExtAccessTests < Test::Unit::TestCase
-  def test_number_of_captures
-    assert_equal 0, //.number_of_captures
-    assert_equal 1, /.(.)./.number_of_captures
-    assert_equal 2, /.(.).(?:.).(.)/.number_of_captures
-    assert_equal 3, /.((.).(?:.).(.))/.number_of_captures
-  end
-
   def test_multiline
     assert_equal true, //m.multiline?
     assert_equal false, //.multiline?
     assert_equal false, /(?m:)/.multiline?
   end
-
-  def test_optionalize
-    assert_equal "a?", Regexp.optionalize("a")
-    assert_equal "(?:foo)?", Regexp.optionalize("foo")
-    assert_equal "", Regexp.optionalize("")
-  end
-
-  def test_unoptionalize
-    assert_equal "a", Regexp.unoptionalize("a?")
-    assert_equal "foo", Regexp.unoptionalize("(?:foo)?")
-    assert_equal "", Regexp.unoptionalize("")
-  end
 end
diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb
new file mode 100644
index 0000000000..9175c8f26e
--- /dev/null
+++ b/activesupport/test/notifications_test.rb
@@ -0,0 +1,201 @@
+require 'abstract_unit'
+
+# Allow LittleFanout to be cleaned.
+class ActiveSupport::Notifications::LittleFanout
+  def clear
+    @listeners.clear
+  end
+end
+
+class NotificationsEventTest < Test::Unit::TestCase
+  def test_events_are_initialized_with_details
+    event = event(:foo, Time.now, Time.now + 1, 1, random_id, :payload => :bar)
+    assert_equal :foo, event.name
+    assert_equal Hash[:payload => :bar], event.payload
+  end
+
+  def test_events_consumes_information_given_as_payload
+    time = Time.now
+    event = event(:foo, time, time + 0.01, 1, random_id, {})
+
+    assert_equal Hash.new, event.payload
+    assert_equal time, event.time
+    assert_equal 1, event.result
+    assert_equal 10.0, event.duration
+  end
+
+  def test_event_is_parent_based_on_time_frame
+    time = Time.utc(2009, 01, 01, 0, 0, 1)
+
+    parent    = event(:foo, Time.utc(2009), Time.utc(2009) + 100, nil, random_id, {})
+    child     = event(:foo, time, time + 10, nil, random_id, {})
+    not_child = event(:foo, time, time + 100, nil, random_id, {})
+
+    assert parent.parent_of?(child)
+    assert !child.parent_of?(parent)
+    assert !parent.parent_of?(not_child)
+    assert !not_child.parent_of?(parent)
+  end
+
+protected
+
+  def random_id
+    @random_id ||= ActiveSupport::SecureRandom.hex(10)
+  end
+
+  def event(*args)
+    ActiveSupport::Notifications::Event.new(*args)
+  end
+end
+
+class NotificationsMainTest < Test::Unit::TestCase
+  def setup
+    @events = []
+    Thread.abort_on_exception = true
+    ActiveSupport::Notifications.subscribe do |*args|
+      @events << ActiveSupport::Notifications::Event.new(*args)
+    end
+  end
+
+  def teardown
+    Thread.abort_on_exception = false
+    ActiveSupport::Notifications.queue.clear
+  end
+
+  def test_notifications_returns_action_result
+    result = ActiveSupport::Notifications.instrument(:awesome, :payload => "notifications") do
+      1 + 1
+    end
+
+    assert_equal 2, result
+  end
+
+  def test_events_are_published_to_a_listener
+    ActiveSupport::Notifications.instrument(:awesome, :payload => "notifications") do
+      1 + 1
+    end
+
+    sleep(0.1)
+
+    assert_equal 1, @events.size
+    assert_equal :awesome, @events.last.name
+    assert_equal Hash[:payload => "notifications"], @events.last.payload
+  end
+
+  def test_nested_events_can_be_instrumented
+    ActiveSupport::Notifications.instrument(:awesome, :payload => "notifications") do
+      ActiveSupport::Notifications.instrument(:wot, :payload => "child") do
+        1 + 1
+      end
+
+      sleep(0.1)
+
+      assert_equal 1, @events.size
+      assert_equal :wot, @events.first.name
+      assert_equal Hash[:payload => "child"], @events.first.payload
+    end
+
+    sleep(0.1)
+
+    assert_equal 2, @events.size
+    assert_equal :awesome, @events.last.name
+    assert_equal Hash[:payload => "notifications"], @events.last.payload
+    assert_in_delta 100, @events.last.duration, 70
+  end
+
+  def test_event_is_pushed_even_if_block_fails
+    ActiveSupport::Notifications.instrument(:awesome, :payload => "notifications") do
+      raise "OMG"
+    end rescue RuntimeError
+
+    sleep(0.1)
+
+    assert_equal 1, @events.size
+    assert_equal :awesome, @events.last.name
+    assert_equal Hash[:payload => "notifications"], @events.last.payload
+  end
+
+  def test_event_is_pushed_even_without_block
+    ActiveSupport::Notifications.instrument(:awesome, :payload => "notifications")
+    sleep(0.1)
+
+    assert_equal 1, @events.size
+    assert_equal :awesome, @events.last.name
+    assert_equal Hash[:payload => "notifications"], @events.last.payload
+  end
+
+  def test_subscribed_in_a_transaction
+    @another = []
+
+    ActiveSupport::Notifications.subscribe("cache") do |*args|
+      @another << ActiveSupport::Notifications::Event.new(*args)
+    end
+
+    ActiveSupport::Notifications.instrument(:cache){ 1 }
+    ActiveSupport::Notifications.transaction do
+      ActiveSupport::Notifications.instrument(:cache){ 1 }
+    end
+    ActiveSupport::Notifications.instrument(:cache){ 1 }
+
+    sleep 0.1
+
+    before, during, after = @another.map {|e| e.transaction_id }
+    assert_equal before, after
+    assert_not_equal before, during
+  end
+
+  def test_subscriber_with_pattern
+    @another = []
+
+    ActiveSupport::Notifications.subscribe("cache") do |*args|
+      @another << ActiveSupport::Notifications::Event.new(*args)
+    end
+
+    ActiveSupport::Notifications.instrument(:cache){ 1 }
+
+    sleep(0.1)
+
+    assert_equal 1, @another.size
+    assert_equal :cache, @another.first.name
+    assert_equal 1, @another.first.result
+  end
+
+  def test_subscriber_with_pattern_as_regexp
+    @another = []
+    ActiveSupport::Notifications.subscribe(/cache/) do |*args|
+      @another << ActiveSupport::Notifications::Event.new(*args)
+    end
+
+    ActiveSupport::Notifications.instrument(:something){ 0 }
+    ActiveSupport::Notifications.instrument(:cache){ 1 }
+
+    sleep(0.1)
+
+    assert_equal 1, @another.size
+    assert_equal :cache, @another.first.name
+    assert_equal 1, @another.first.result
+  end
+
+  def test_with_several_consumers_and_several_events
+    @another = []
+    ActiveSupport::Notifications.subscribe do |*args|
+      @another << ActiveSupport::Notifications::Event.new(*args)
+    end
+
+    1.upto(100) do |i|
+      ActiveSupport::Notifications.instrument(:value){ i }
+    end
+
+    sleep 0.1
+
+    assert_equal 100, @events.size
+    assert_equal :value, @events.first.name
+    assert_equal 1, @events.first.result
+    assert_equal 100, @events.last.result
+
+    assert_equal 100, @another.size
+    assert_equal :value, @another.first.name
+    assert_equal 1, @another.first.result
+    assert_equal 100, @another.last.result
+  end
+end
diff --git a/activesupport/test/orchestra_test.rb b/activesupport/test/orchestra_test.rb
deleted file mode 100644
index 683cc36f6a..0000000000
--- a/activesupport/test/orchestra_test.rb
+++ /dev/null
@@ -1,161 +0,0 @@
-require 'abstract_unit'
-
-class OrchestraEventTest < Test::Unit::TestCase
-  def setup
-    @parent = ActiveSupport::Orchestra::Event.new(:parent)
-  end
-
-  def test_initialization_with_name_and_parent_and_payload
-    event = ActiveSupport::Orchestra::Event.new(:awesome, @parent, :payload => "orchestra")
-    assert_equal(:awesome, event.name)
-    assert_equal(@parent, event.parent)
-    assert_equal({ :payload => "orchestra" }, event.payload)
-  end
-
-  def test_thread_id_is_set_on_initialization
-    event = ActiveSupport::Orchestra::Event.new(:awesome)
-    assert_equal Thread.current.object_id, event.thread_id
-  end
-
-  def test_current_time_is_set_on_initialization
-    previous_time = Time.now.utc
-    event = ActiveSupport::Orchestra::Event.new(:awesome)
-    assert_kind_of Time, event.time
-    assert event.time.to_f >= previous_time.to_f
-  end
- 
-  def test_duration_is_set_when_event_finishes
-    event = ActiveSupport::Orchestra::Event.new(:awesome)
-    sleep(0.1)
-    event.finish!
-    assert_in_delta 100, event.duration, 30
-  end
-end
-
-class OrchestraMainTest < Test::Unit::TestCase
-  def setup
-    @listener = []
-    ActiveSupport::Orchestra.register @listener
-  end
-
-  def teardown
-    ActiveSupport::Orchestra.unregister @listener
-  end
-
-  def test_orchestra_allows_any_action_to_be_instrumented
-    event = ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
-      sleep(0.1)
-    end
-
-    assert_equal :awesome, event.name
-    assert_equal "orchestra", event.payload
-    assert_in_delta 100, event.duration, 30
-  end
-
-  def test_block_result_is_stored
-    event = ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
-      1 + 1
-    end
-
-    assert_equal 2, event.result
-  end
-
-  def test_events_are_published_to_a_listener
-    event = ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
-      1 + 1
-    end
-
-    assert_equal 1, @listener.size
-    assert_equal :awesome, @listener.last.name
-    assert_equal "orchestra", @listener.last.payload
-  end
-
-  def test_nested_events_can_be_instrumented
-    ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
-      ActiveSupport::Orchestra.instrument(:wot, "child") do
-        sleep(0.1)
-      end
-
-      assert_equal 1, @listener.size
-      assert_equal :wot, @listener.first.name
-      assert_equal "child", @listener.first.payload
-
-      assert_nil @listener.first.parent.duration
-      assert_in_delta 100, @listener.first.duration, 30
-    end
-
-    assert_equal 2, @listener.size
-    assert_equal :awesome, @listener.last.name
-    assert_equal "orchestra", @listener.last.payload
-    assert_in_delta 100, @listener.first.parent.duration, 30
-  end
-
-  def test_event_is_pushed_even_if_block_fails
-    ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
-      raise "OMG"
-    end rescue RuntimeError
-
-    assert_equal 1, @listener.size
-    assert_equal :awesome, @listener.last.name
-    assert_equal "orchestra", @listener.last.payload
-  end
-end
-
-class OrchestraListenerTest < Test::Unit::TestCase
-  class MyListener < ActiveSupport::Orchestra::Listener
-    attr_reader :consumed
-
-    def consume(event)
-      @consumed ||= []
-      @consumed << event
-    end
-  end
-
-  def setup
-    @listener = MyListener.new
-    ActiveSupport::Orchestra.register @listener
-  end
-
-  def teardown
-    ActiveSupport::Orchestra.unregister @listener
-  end
-
-  def test_thread_is_exposed_by_listener
-    assert_kind_of Thread, @listener.thread
-  end
-
-  def test_event_is_consumed_when_an_action_is_instrumented
-    ActiveSupport::Orchestra.instrument(:sum) do
-      1 + 1
-    end
-    sleep 0.1
-    assert_equal 1, @listener.consumed.size
-    assert_equal :sum, @listener.consumed.first.name
-    assert_equal 2, @listener.consumed.first.result
-  end
-
-  def test_with_sevaral_consumers_and_several_events
-    @another = MyListener.new
-    ActiveSupport::Orchestra.register @another
-
-    1.upto(100) do |i|
-      ActiveSupport::Orchestra.instrument(:value) do
-        i
-      end
-    end
-
-    sleep 0.1
-
-    assert_equal 100, @listener.consumed.size
-    assert_equal :value, @listener.consumed.first.name
-    assert_equal 1, @listener.consumed.first.result
-    assert_equal 100, @listener.consumed.last.result
-
-    assert_equal 100, @another.consumed.size
-    assert_equal :value, @another.consumed.first.name
-    assert_equal 1, @another.consumed.first.result
-    assert_equal 100, @another.consumed.last.result
-  ensure
-    ActiveSupport::Orchestra.unregister @another
-  end
-end