Merge branch 'master' into 'patch-449'

# Conflicts:
#   data/events.yml
5 jobs for patch-449 in 11 minutes and 24 seconds (queued for 52 minutes and 29 seconds)