Sync HTT code with their fork. Conflicts resolved based on what looked more recent.
/cc @jahreda @fpastore @martyniu @nstyles