Merge pull request #2 from mockjs/master

Auto merge by kpm server