Add a table of contents
Pull in upstream changes