Using 2.3.11 URL for 2.3.x guides [ci skip]
Fix missed stubs of File.exists? when changing to File.exist?

Change to File.exist? to reduce some Ruby 2.1 warnings was introduced
in 4-0-stable branch in 02393966720002314765850776fb16d2539c9415.
Remove deprecated call to Relation#all
Revert "Merge pull request #13149 from laurocaetano/fix_offset_last"

This reverts commit e18b2ca1289d08f76ff3e6ed09f1bf02ab8b7a04.

Reason: this change in behavior may cause some unexpected breakage in
applications relying on a stable version/branch, so we are leaving it
only on Rails master for now (which will be available with the 4.1 release).

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/test/cases/finder_test.rb
Improve AR changelog [ci skip]
Merge pull request #13122 from andrielfn/fix-collection-label-class

Fix the merge of a label class defined inside the block
Conflicts:
	actionpack/test/template/form_collections_helper_test.rb
	actionview/CHANGELOG.md
ActiveRecord::ConnectionAdapters::Column.string_to_time method respects string with timezone.

Closes #12278
Closes #12459

Conflicts:
	activerecord/CHANGELOG.md
Add integration test for #12459
Merge pull request #13207 from georgeguimaraes/backports-12290-to-4-0-stable

Backports #12290 to 4-0-stable. Closes #12459
Merge pull request #12684 from mariovisic/fix_kernel_silence_stream_descriptor_leak

Fix issue with Kernel#silence_stream leaking file descriptors
Conflicts:
	activesupport/CHANGELOG.md
Remove tests backported that should not
SAFE = 4 is deprecated in Ruby 2.1
Fix `singleton_class?`

Due to changes from http://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39628 current `singleton_class?` implementation fails.
Changed based on reference from http://bugs.ruby-lang.org/issues/7609
2.1.0 is green
Support deprecated finder options on associaiton calculations.

Closes #13165.

While the finder options are deprecated in `4.0` they still need to
continue working. They will be completely removed in `4.1`.
Merge pull request #13236 from jetthoughts/13230_type_cast_bug_in_agr_functions

Fix type cast on group sum with custom expression
Conflicts:
	activerecord/CHANGELOG.md
doc: date/conversions.rb should talk about date format not time format.

Closes #13245.

[ci skip]
make `collect_deprecations` available.

There are circumstances where the capabilities of `assert_deprecated` and
`assert_not_deprecated` are not enough. For example if a ccertain call-path
raises two deprecations but should only raise a single one.

This module is still :nodoc and intented for internal use.

/cc @rafaelfranca
[ci skip] Fix http_accept_language link syntax in 4-0-stable
Merge pull request #13259 from harshadsabne/4-0-stable

[ci skip] Fix http_accept_language link syntax