Merged default into 3.4 branch.  3.4 branch is now effectively 3.4.1rc1.