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