Merge pull request #1 from gitlabhq/master

王权利请求将github/fork/zzmjohn/master合并到master

Created by: zzmjohn

update

合并请求报告