Add a table of contents
Merge remote-tracking branch 'upstream/master'