Fixes #3216.
Merge branch 'master' of git://github.com/yiisoft/yii2