It's now possible to set hostname on the server
Merge remote-tracking branch 'origin/develop'