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