Merge pull request #1 from yiisoft/master

20140618