Merge branch 'master' into fsf-master

new docker image, according the launcher merge conflict

diff --cc launcher
index 1f6d96b6aec5566fdcd8037803d86046a232c3fa,4e615927503187c33d970fc27142d7ad0238e080..068b91e3e0cbf765df6a37178b36202269035049
--- 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.20190217
 -image="discourse/base:2.0.20190321-0122"
++#image="discourse/base:2.0.20190321-0122"
 +image=discourse/base:build
  docker_path=`which docker.io 2> /dev/null || which docker`
  git_path=`which git`