Merge branch 'master' into notification-delivery

# Conflicts:
#	db/schema.rb
#	test/models/event_test.rb
#	vue/tests/e2e/specs/announcements.js