- wait a bit longer for server shutdown
Merge remote-tracking branch 'origin/trunk' into trunk