Merge 3.4.0b2 release revisions back into mainline.