Authored by htoooth

Merge branch 'master' of http://git.yoho.cn/fe/yoho-apm