Fixes #6059.
Merge branch 'master' of git://github.com/yiisoft/yii2

Conflicts:
	docs/guide-uk/concept-autoloading.md