Merge branch 'master' into 'revert'

# Conflicts:
#   docker-compose.yml
4 jobs for revert in 1 minute and 37 seconds (queued for 3 seconds)