Default to localhost without anything else but the server's definition
Merge pull request #1056 from padrino/default-server-to-localhost

Default to localhost without anything else but the server's definition
Merge remote-tracking branch 'upstream/master' into super-admin