Merge pull request #3800 from madewokherd/mingwbuild