Merge 3.x "what's new" with release notes

These two shouldn't be separate pages, so... merge 'em.