Merge branch 'master' into 'ext/devel/bugfix-remove-gelf-logs'

# Conflicts:
#   zoe_master/backends/swarm/api_client.py
3 jobs for ext/devel/bugfix-remove-gelf-logs in 4 minutes and 10 seconds (queued for 1 second)