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