ServerCommand can let the main thread exit.

This should simplify everyone's lives.
Merge remote-tracking branch 'upstream/master'