merge 0.4-7.planetlab changes