Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	framework/CHANGELOG.md
	framework/base/Security.php
	framework/console/controllers/MessageController.php
	framework/db/oci/Schema.php
	framework/web/ErrorAction.php
	framework/web/Request.php