Merge branch 'master' of dhozac@git.planet-lab.org:/git/pyplnet