From: Andrew Engelbrecht <andrew@fsf.org>
Date: Thu, 10 Jan 2019 17:03:51 +0000 (-0500)
Subject: Merge branch 'master' into fsf-master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=45dc3f7768dee4fc787dd26a5f9ee5ba07553933;p=discourse_docker.git

Merge branch 'master' into fsf-master

Pulling in upstream changes
---

45dc3f7768dee4fc787dd26a5f9ee5ba07553933