fixed bug that meant directly rendered cms layouts would not render the parents headers
merge
Merge branch 'master' into merging-upstream