Blender Git Loki

Merge branch 'master' into greasepencil-object

Conflicts:
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/gpencil_modifier.c
source/blender/editors/gpencil/annotate_paint.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/object/object_hook.c
source/blender/editors/space_clip/clip_graph_draw.c