Merge 3.4.0a4 release head back into trunk.