only source server options on linux
Merge remote-tracking branch: upstream/master