Merge upstream codeql-cli/latest.
#331
+168,704
−81,651
Merged