Merge commit 'd3021c628134293c2b8af505806efc2fba4fe947'

# Conflicts:
#	resources/vanilla

src/utils/Config.php

@@ -471,7 +471,8 @@ class Config{
 	}
 
 	/**
-	 * @param array $data reference parameter
+	 * @param mixed[] $default
+	 * @param mixed[] $data reference parameter
 	 */
 	private function fillDefaults(array $default, &$data) : int{
 		$changed = 0;

src/utils/MainLogger.php

@@ -139,7 +139,7 @@ class MainLogger extends \AttachableThreadedLogger{
 	}
 
 	/**
-	 * @param array|null $trace
+	 * @param mixed[][]|null $trace
 	 *
 	 * @return void
 	 */