Null merge from 3.4 (well, except, pull in the tag for 3.4.5.)