Additional top nav attributes pulled through from plugins
Merge remote-tracking branch 'upstream/release_candidate' into feature_theme-from-release-candidate