Update nav to reflect new WordPress IA (fixes #7131)
Merge branch 'release-v15.0'