merge from planetlab/master