Merge branch 'planetlab/master'