string include fix for 64bit windows build
Merge remote-tracking branch 'origin' into builds
adding windows plugin files