Merged 3.4.0b1 release head back into trunk.