Merge branch 'master' into 'patch-281'

# Conflicts:
#   data/events.yml
5 jobs for patch-281 in 14 minutes and 10 seconds (queued for 4 seconds)