fix build warnings under VS
Merge branch 'prerelease'