Don't need that Promise.all anymore
Merge branch 'master' into appengine-proxy