Blender Git Loki

Merge branch 'master' into greasepencil-object

Conflicts:
release/scripts/startup/bl_ui/properties_material_gpencil.py
source/blender/draw/engines/gpencil/gpencil_cache_utils.c
source/blender/draw/engines/gpencil/gpencil_draw_data.c
source/blender/draw/engines/gpencil/gpencil_engine.h
source/blender/draw/engines/gpencil/gpencil_shader_fx.c
source/blender/draw/engines/gpencil/shaders/gpencil_frag.glsl
source/blender/makesrna/intern/rna_material.c