Merge pull request #2297 from akoeplinger/msvc-autoupdate-config.h