Merge branch 'master' of github.com:mintao/yii2 into mintao-master

Conflicts:
	extensions/yii/elasticsearch/CHANGELOG.md