merge 0.4-4.planetlab changes