Commit 4aa9e36983819fa423fefb7bea3001a1369106a2

Ryan C. Gordon 2017-01-05T19:45:57

Patched to compile on some compilers.