Eager loading made to use relation's in_clause_length instead of host's one (fixes #8474)
Test nested fields with AssociationProxy mockup & fix AssociationProxy support in form helper
evaluate the dependency blocks at the instance level, not class level
add asset pipeline guides section on implementing & registering own engines
Merge pull request #8821 from jamis/master

Evaluate view_cache_dependencies at the instance level

Conflicts:
	actionpack/lib/action_controller/caching.rb
extract PerformanceTest into rails-performance_tests gem
remove performance tests from the default stack
remove the rails guide on performance testing
Merge pull request #8876 from senny/extract_performance_tests

Extract ActionDispatch::PerformanceTest
mention performance test extraction in 4.0 guide
Merge pull request #8878 from senny/add_performance_test_extraction_to_guide

Mention performance test extraction in 4.0 guide
Include jbuilder by default and rely on its scaffold generator to show json API. The default scaffold will now just create HTML if the user actively opts out of jbuilder
Relax bundler dep until 1.3.0 is actually released.

Revert "Bump bundler dep to 1.3.0.pre.4+ to introduce 'bundle binstubs <gem>'"

This reverts commit e00b8ecf1ad8984b760f12e61247820613aec4ee.

Revert "Use bundler --pre for travis builds"

This reverts commit 4d240ec20a70122b7e69c790a37d2be14e1ff038.
Merge pull request #8869 from goshakkk/guides-asset-pipeline-tilt

Add asset pipeline guides section on implementing & registering own engines
clearer conditional in constraint match check
Updating Array access docs more consistent
[ci skip]
Merge pull request #8884 from mattdbridges/array-access-doc-fixes

Updating Array access docs more consistent
Covering untested methods for ActiveModel::Errors
Specified jbuilder version
Merge pull request #8886 from rwz/specify-jbuilder-version

Specified jbuilder version