bug fix.
Merge branch 'master' of github.com:yiisoft/yii2