Commit 4659e73892959be3a2b15ef14b39529dcfefdee9

Ryan C. Gordon 2018-11-01T12:31:45

merge fallout: Patched to compile, fixed some compiler warnings, etc.