Blender Git Loki

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenkernel/BKE_gpencil.h
source/blender/blenkernel/intern/gpencil_modifier.c
source/blender/draw/engines/gpencil/gpencil_cache_utils.c
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
source/blender/draw/engines/gpencil/gpencil_engine.h
source/blender/makesdna/DNA_object_types.h