Merge headings branch into master.