Don't mutate the Base settings by merge!ing the given value
Merge pull request #11620 from spajus/update_docs

Update Rails 3.2.x guide link [ci skip]
Merge pull request #11653 from ankit8898/typo

Fixing the broken URL [skip ci]
Revert change on ActiveRecord::Relation#order method that prepends new
order on the old ones

The previous behavior added a major backward incompatibility since it
impossible to have a upgrade path without major changes on the
application code.

We are taking the most conservative path to be consistent with the idea
of having a smoother upgrade on Rails 4.

We are reverting the behavior for what was in Rails 3.x and,
if needed, we will implement a new API to prepend the order clauses in
Rails 4.1.

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/relation/query_methods.rb
	guides/source/upgrading_ruby_on_rails.md
Merge pull request #11664 from thedarkone/digestor-thread-safety

AV::Digestor thread safety fixes
Fix `current_page?` when the URL contains escaped characters

In some cases webservers like nginx send the escaped characters
lowercased to the Rails application. The current_page? helper was
comparing the escaped strings that are different since Ruby escapes the
URL using uppercased characters.

Conflicts:
	actionview/CHANGELOG.md
Make current_page? compare binary strings
Use the right minitest method
Backport changelog fixed from #11713 [ci skip]
Merge pull request #11714 from jetthoughts/11706_remove_bad_override_of_xml

Removed redundant xml override from pg adapter
Conflicts:
	activerecord/CHANGELOG.md
Use assert_nil instead of testing for equality
Merge pull request #11455 from antonio/fix_enable_extension_not_being_defined

Define enable_extension method to prevent undefined method error
Merge pull request #11716 from jetthoughts/use_backquote_for_terms_in_getting_strated

Replaced quotation marks for term by apostrophes in getting started guide [ci skip]
Enable jruby and rubinius on travis
Using URI.parser.unescape to avoid warnings
Merge pull request #11724 from arunagw/warning-removed-ap

Using URI.parser.unescape to avoid warnings
Merge pull request #11741 from Karunakar/failing_test_in_local

fix for postgresql failing test in local
Merge pull request #11712 from atambo/activesupport_testing_isolation_jruby

Fix ActiveSupport::Testing::Isolation on jruby
Merge pull request #11738 from gaurish/guides-association-basics-fix

[Fixes #11734]Correct Association Basics Guide on has_and_belongs_to_many

[ci skip]
Merge pull request #11733 from iainbeeston/master

i18n guide update: corrected reference to activerecord to instead reference activemodel
Conflicts:
	guides/source/i18n.md

[ci skip]