Merge branch 'master' of git.verivue.com:/git/planetlab/build