Merge branch 'master' into fsf-master

diff --cc image/base/Dockerfile
Simple merge

diff --cc launcher
index 3a1091f6e795f14d7cff984f56e616211af5d69e,1383ec85561f030b7ff7a5b4c9e410d769dc254a..efc762c4042b9f38bc8c77f7435fb5fa15e5c795
--- 1/launcher
--- 2/launcher
+++ b/launcher
@@@ -69,8 -69,7 +69,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.20181010
 -image=discourse/base:2.0.20181031
++#image=discourse/base:2.0.20181031
 +image=discourse/base:build
  docker_path=`which docker.io || which docker`
  git_path=`which git`