Clean up the server imp'l some
Merge remote-tracking branch 'origin/master'