minor edit [skip ci]
Merge branch 'master' of git://github.com/yiisoft/yii2