Merge branch 'master' into fsf-master

diff --cc launcher
index 262e0fa9263ea91b1d177bd6cbf1c16aa9cf2147,d9c53ae23512f8163cacca3a076316facb698874..764ba82a6b6db7d5a55985d83c1c15748be352aa
--- 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.20190505-2322"
 -image="discourse/base:2.0.20190625-0946"
++#image="discourse/base:2.0.20190625-0946"
 +image=discourse/base:build
  docker_path=`which docker.io 2> /dev/null || which docker`
  git_path=`which git`