See if this fixes the Windows build issues.
Merge branch 'master' of github.com:OpenLightingProject/ola
Attempt 2
Merge pull request #557 from nomis52/master

Fix the Windows build.