Commit 417713a75c6def409529852ff2429ffa1226a6a2

Jimb Esser 2020-03-20T19:49:19

Probable fix for compile errors on Mac OS and (non-VS) Win32