Merge branch 'master' into cherry

Conflicts:
	activesupport/CHANGELOG
	activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
	activesupport/lib/active_support/core_ext/hash/conversions.rb
	activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
	activesupport/lib/active_support/core_ext/string/multibyte.rb
	activesupport/lib/active_support/core_ext/time/calculations.rb
	activesupport/lib/active_support/deprecation.rb

1 files changed, 3 insertions, 11 deletions

diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index 608e3ad29c..b73c3b2c9b 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -101,19 +101,11 @@ class Time
     since(-seconds)
   end
 
-  # Returns a new Time representing the time a number of seconds since the instance time, this is basically a wrapper around
-  # the Numeric extension.
+  # Returns a new Time representing the time a number of seconds since the instance time
   def since(seconds)
-    f = seconds.since(self)
-    if ActiveSupport::Duration === seconds
-      f
-    else
-      initial_dst = dst? ? 1 : 0
-      final_dst   = f.dst? ? 1 : 0
-      (seconds.abs >= 86400 && initial_dst != final_dst) ? f + (initial_dst - final_dst).hours : f
-    end
+    self + seconds
   rescue
-    self.to_datetime.since(seconds)
+    to_datetime.since(seconds)
   end
   alias :in :since