Fixes issue #294.
Merge branch 'master' of https://github.com/yiisoft/yii2