Commit 81ab6c98fdf1d921e1083a476acf9cd40869a6a2

Ryan C. Gordon 2017-05-18T16:27:36

Patched to compile on Windows.