Fixed yii2-beta compatibility
Merge remote-tracking branch 'origin/master'