Merge branch 'master' into chatter-fixes-and-improvements

inc/engine.h

@@ -227,6 +227,9 @@ public:
    // print the version to server console on startup
    void printBotVersion ();
 
+   // ensure prosperous gaming environment as per: https://github.com/yapb/yapb/issues/575
+   void ensureHealthyGameEnvironment ();
+
    // public inlines
 public:
    // get the current time on server

inc/yapb.h

@@ -892,6 +892,7 @@ extern ConVar cv_ignore_objectives;
 extern ConVar cv_chat;
 extern ConVar cv_language;
 extern ConVar cv_show_latency;
+extern ConVar cv_show_avatars;
 extern ConVar cv_enable_query_hook;
 extern ConVar cv_chatter_path;
 extern ConVar cv_quota;