Merge branch 'master' of ssh://soltesz@git.planet-lab.org/git/monitor