Merge branch '4-0-0' into 4-0-stable

Conflicts:
	actionpack/CHANGELOG.md
	activemodel/CHANGELOG.md
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
	guides/source/getting_started.md
	railties/CHANGELOG.md