merge: updates from upstream

Conflicts:
    mix.exs
    mix.lock

Makefile

@@ -36,6 +36,10 @@ test:  ## run tests
 compose_up:  ## start containers for this service
 	@$(COMPOSE) up -d
 
+.PHONY: compose_deps_upgrade
+compose_deps_upgrade:  ## install/upgrade deps
+	@$(COMPOSE) run --entrypoint mix app do deps.get, deps.compile, compile
+
 .PHONY: compose_test
 compose_test:  ## run tests in containers
 	@$(COMPOSE) run -e MIX_ENV=test --entrypoint make app test