Merge branch 'master' into fsf-master

author Andrew Engelbrecht <andrew@fsf.org>

Mon, 17 Jun 2019 15:06:53 +0000 (11:06 -0400)

committer Andrew Engelbrecht <andrew@fsf.org>

Mon, 17 Jun 2019 15:06:53 +0000 (11:06 -0400)
author Andrew Engelbrecht <andrew@fsf.org>
Mon, 17 Jun 2019 15:06:53 +0000 (11:06 -0400)
committer Andrew Engelbrecht <andrew@fsf.org>
Mon, 17 Jun 2019 15:06:53 +0000 (11:06 -0400)
diff --cc image/base/Dockerfile
Simple merge
diff --cc image/discourse_test/Dockerfile
Simple merge
diff --cc launcher
Simple merge
author	Andrew Engelbrecht <andrew@fsf.org>
	Mon, 17 Jun 2019 15:06:53 +0000 (11:06 -0400)
committer	Andrew Engelbrecht <andrew@fsf.org>
	Mon, 17 Jun 2019 15:06:53 +0000 (11:06 -0400)
		1	2
image/base/Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
image/discourse_test/Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
launcher	patch \|	diff1 \|	diff2 \|	blob \| history