Wait for ct-server to exit.
Merge branch 'master' into super_duper