fix server_name
Merge branch 'origin/master'