Fixes #9862: "Remove references to gcc-mingw"
Merge branch 'master' into augmented-bstree