Fix server detection.
Merge remote-tracking branch 'lrsjng/develop' into develop