Merge pull request #1 from yiisoft/master

Update from original