Blender Git Commit Log

Merge remote-tracking branch 'origin/master' into lanpr-under-gp

# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
# source/blender/blenloader/intern/versioning_290.c
# source/blender/makesdna/DNA_brush_types.h
# source/blender/makesdna/DNA_gpencil_modifier_types.h
# source/blender/makesrna/intern/rna_scene.c
# source/tools