Merge from yiisoft/yii