Fix server_options_test
Merge remote-tracking branch 'upstream/master'