Commit c8911ede68dc33a19e540b0c1026d3cbfb0067d3

Brent Cook 2021-05-30T17:53:02

Land #674, fix mingw builds with newer compiler versions