Merge branch 'master' into fsf-master

diff --cc launcher
index 11be64626ac168f5a959fa84b274e29af15594b0,8ef915c95d2d8fe49045564249f48c02da74d533..070a8fc0191f7790f8fd1b4210c134fb016b4cc7
--- 1/launcher
--- 2/launcher
+++ b/launcher
@@@ -81,8 -81,7 +81,8 @@@ git_rec_version='1.8.0
  config_file=containers/"$config".yml
  cidbootstrap=cids/"$config"_bootstrap.cid
  local_discourse=local_discourse
- #image="discourse/base:2.0.20190429-1058"
 -image="discourse/base:2.0.20190505-2322"
++#image="discourse/base:2.0.20190505-2322"
 +image=discourse/base:build
  docker_path=`which docker.io 2> /dev/null || which docker`
  git_path=`which git`