Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi into HEAD