bundle server binary
Merge remote-tracking branch: upstream/master