Merge pull request #1589 from auouymous/fix-windows-launcher-warnings