Fix for Win32 require in ConfigFinder (issue #231)

This doesn't fix the Windows installation problem, but does get around
the circular dependency noted by @damil.
Merge 'dev'->kessel (Win32 fix)