Blender Git Loki

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

# Conflicts:
# release/datafiles/locale
# release/scripts/addons_contrib
# source/blender/editors/mesh/editmesh_tools.c
# source/blender/editors/space_outliner/outliner_draw.c
# source/blender/makesdna/DNA_modifier_types.h
# source/blender/makesrna/intern/rna_modifier.c
# source/blender/modifiers/MOD_modifiertypes.h
# source/blender/modifiers/intern/MOD_util.c
# source/tools