Hodorgasm - 2017-10-10

Actually, the other patch doesn't work if building with GCC-6 and including -std=c++98 in CXXFLAGS.