从gitcafe移植回来
Merge remote-tracking branch 'origin/master'