Real men use Travis-CI
Merge remote-tracking branch 'origin/master'