Detect server base URL
Merge branch 'master' into 1.0/develop