Merge branch 'master' into 2.4
Uncomment test.

I missed this earlier, because I'm a doofus.
Added tests
Re-assign $db after beforeSave.

This allows model/behavior methods to change the datasource in the
beforeSave callback. If you use drivers from different SQL platforms
things will go very poorly.

Fixes #3606
No use of type key in ClassRegistry::init()
Merge pull request #1242 from sime/noTypeInClassRegistryInit-master

No use of type key in ClassRegistry::init()
Second parameter of ClassRegistry::init() is a boolean, not a string
Remove leftover param that is now wrongly triggering "strict"
Merge pull request #1243 from sime/translateCRInitCall

Second parameter of ClassRegistry::init() is a boolean, not a string
Avoid unnecessary overhead if user record already available from session.
correct spelling mistake
Removing extra whitespace, phpcs fix
Fixed some typos in core.php
Fixed some typos in core.php

In sync with this one https://github.com/cakephp/cakephp/pull/1244
Merge pull request #1244 from ravage84/patch-3

Fixed some typos in core.php
Merge pull request #1245 from ravage84/patch-4

Fixed some typos in core.php
Fix Vendor/bin/cake not working when installing CakePHP with composer.
Fixing case where it was possible to pass array data to FormAuthenticate
fields
Update version number to 2.3.3
Merge branch 'master' into 2.4

Conflicts:
	lib/Cake/VERSION.txt