- bug #4163 Setup script does not recognize manually-configured server
- Improve English
Fix merge conflicts