Blender Git Loki

Merge branch 'master' into eevee-motionblur-object

# Conflicts:
# source/blender/draw/engines/eevee/eevee_data.c
# source/blender/draw/engines/eevee/eevee_effects.c
# source/blender/draw/engines/eevee/eevee_motion_blur.c
# source/blender/gpu/GPU_vertex_format.h
# source/blender/makesdna/DNA_userdef_types.h
# source/blender/makesrna/intern/rna_userdef.c