Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 2 insertions, 3 deletions

diff --git a/activesupport/lib/active_support/core_ext/string/iterators.rb b/activesupport/lib/active_support/core_ext/string/iterators.rb
index 472de7bc24..2f8aa84024 100644
--- a/activesupport/lib/active_support/core_ext/string/iterators.rb
+++ b/activesupport/lib/active_support/core_ext/string/iterators.rb
@@ -1,11 +1,10 @@
 unless '1.9'.respond_to?(:each_char)
-  autoload :StringScanner, 'strscan' unless defined? :StringScanner
-
   class String
     # Yields a single-character string for each character in the string.
     # When $KCODE = 'UTF8', multi-byte characters are yielded appropriately.
     def each_char
-      scanner, char = StringScanner.new(self), /./mu
+      require 'strscan' unless defined? ::StringScanner
+      scanner, char = ::StringScanner.new(self), /./mu
       while c = scanner.scan(char)
         yield c
       end