Merge remote-tracking branch 'origin/master' into pullinprivate

Conflicts:
	workers/dockerfilebuild.py

util/cache.py

@@ -29,6 +29,6 @@ def no_cache(f):
   @wraps(f)
   def add_no_cache(*args, **kwargs):
     response = f(*args, **kwargs)
-    response.headers['Cache-Control'] = 'no-cache'
+    response.headers['Cache-Control'] = 'no-cache, no-store, must-revalidate'
     return response
   return add_no_cache