Commit 9b4db2b8aa45b4cdf52b8ed9cbfe96d7b3d1a718

Ryan C. Gordon 2016-04-12T18:11:36

Patched to compile on various platforms.