Merge branch 'jhh-dev' of git://git.planet-lab.org/plstackapi into jhh-dev