Merge pull request #1 from mockjs/master

Auto merge by kpm server