Merge branch 'master' into 'theconf-event'

# Conflicts:
#   data/events.yml
5 jobs for theconf-event in 15 minutes and 46 seconds (queued for 4 seconds)