Merge pull request #3263 from fluffyfreak/master

Potentially fix MXE compilation warnings.