Change everything to new section headings.
Merge remote-tracking branch 'upstream/master'