merge 0.4-5.planetlab changes