Merge pull request #12255 from neheb/libconfig