Merge branch 'master' of https://github.com/discourse/discourse_docker