Resolve merge conflicts with master.

evennia/server/server.py

@@ -455,6 +455,11 @@ class Evennia(object):
         # (this also starts any that didn't yet start)
         ScriptDB.objects.validate(init_mode=mode)
 
+        # start the task handler
+        from evennia.scripts.taskhandler import TASK_HANDLER
+        TASK_HANDLER.load()
+        TASK_HANDLER.create_delays()
+
         # delete the temporary setting
         ServerConfig.objects.conf("server_restart_mode", delete=True)