Merge branch 'fix-pr11345-lex' into maint * fix-pr11345-lex: tests: fix a failure in Lex/C++ tests on Mac OS X