Merge branch 'master' into animation_keyboard_shortcuts

# Conflicts:
#	.gitignore
8 jobs for animation_keyboard_shortcuts in 125 minutes and 54 seconds (queued for 1 second)