Merge branch 'master' into fsf-master

diff --cc image/base/Dockerfile
Simple merge

diff --cc launcher
index 1b78c505763eac547c443264c58913044293f098,19fbf4593f239f5ddbf8ef34f19ec3a987c1415a..ba5edb8af7132f7266e158e3356b4322d2977085
--- 1/launcher
--- 2/launcher
+++ b/launcher
@@@ -80,8 -80,7 +80,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.20181031
 -image=discourse/base:2.0.20190217
++#image=discourse/base:2.0.20190217
 +image=discourse/base:build
  docker_path=`which docker.io || which docker`
  git_path=`which git`