Merge latest mods from dev

Now that client has stabilized, we should restart the server trains.