Make sure range strings are quoted after we quote the range.
Preparing for 4.1.4 release
Merge branch '4-1-4' into 4-1-stable

Conflicts:
	actionmailer/CHANGELOG.md
	actionpack/CHANGELOG.md
	actionview/CHANGELOG.md
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
	railties/CHANGELOG.md
Merge pull request #16026 from lucasmazza/lm-respond-to-jsonp-fix

Change the JSON renderer to enforce the 'JS' Content Type
Conflicts:
	actionpack/CHANGELOG.md
Merge pull request #16038 from tbpgr/fix_guide_active_record_validations

Fix guide. sample code syntax error.[ci skip]
Merge pull request #16049 from matthewd/find-via-reload

After find-via-reload, the record is not new

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/persistence.rb
	activerecord/test/cases/persistence_test.rb
Merge pull request #16028 from cade/fix_counter_cache_count_with_association_selects

Add `:all` argument to `count` in `reset_counters`

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/lib/active_record/counter_cache.rb
Fix escape_once double-escaping hex-encoded entities

(This is a manual merge of #9102)
The hex escape sequence can be of any length
Add CHANGELOG for c803b90

Conflicts:
	actionview/CHANGELOG.md
fixed issue with ActiveRecord serialize object as JSON

fixes #15594
Merge pull request #16065 from matthewd/mysql-explicit-non-strict

If our connection is explicitly non-strict, tell MySQL
Merge pull request #16059 from jenncoop/json-serialized-attr

Fixed issue with ActiveRecord serialize object as JSON
Merge pull request #16044 from jjb/patch-1

[ci skip] link directly to ActionMailer Previews documentation
Generate shallow paths for all children of shallow resources.

Prior to this commit shallow resources would only generate paths for
non-direct children (with a nested depth greater than 1).

Take the following routes file.

    resources :blogs do
      resources :posts, shallow: true do
        resources :comments do
          resources :tags
        end
      end
    end

This would generate shallow paths for `tags` nested under `posts`,
e.g `/posts/:id/tags/`, however it would not generate shallow paths
for `comments` nested under `posts`, e.g `/posts/:id/comments/new`.

This commit changes the behaviour of the route mapper so that it
generate paths for direct children of shallow resources, for example
if you take the previous routes file, this will now generate
shallow paths for `comments` nested under `posts`, .e.g
`posts/:id/comments/new`.

This was the behaviour in Rails `4.0.4` however this was broken in
@jcoglan's fix for another routes related issue[1].

This also fixes an issue[2] reported by @smdern.

[1] https://github.com/rails/rails/commit/d0e5963
[2] https://github.com/rails/rails/issues/15783

(cherry picked from commit e972d341209f64d1599e30a36b82eee2aa4cd553)

Conflicts:
	actionpack/CHANGELOG.md
[ci skip] Remove reference to getting started sample code.
Merge pull request #16082 from JuanitoFatas/4-1-stable

[ci skip] Remove reference to getting started sample code. (4-1-stable)
Partial back-port of c2d96d14 [ci skip]

[Juanito Fatas + Robin Dupret]