I was very worried about this but it turned out to be nearly trivial. Jason and I talked about committing the HTM merge on Monday. I wanted to get started early in case I ran into trouble. -- Peace, James