merges changes from planetlab.mk