Update 0.3.5 dev with changes in 0.3.4b.