Move 0.3.4 changes up to 0.4.0.