Merge "Improved section headers." into jb-dev