Merging the 3.4.0a1 head.