removed override for default server
Merge remote-tracking branch 'upstream/1.0'