Merge pull request #1666 from Helenerineium/master

Fix warnings on mingw builds