[#26717] Fix headings
Merge branch '7.x-1.x' into 26717-headings

Conflicts:
	CHANGELOG.txt
Merge pull request #357 from previousnext/26717-headings

26717 headings