3.4.5

Also includes one change from 3.4.6, but no biggie