Blender Git Loki

Merge branch 'master' into soc-2018-npr

# Conflicts:
# intern/opensubdiv/internal/opensubdiv_evaluator.cc
# intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc
# release/scripts/startup/bl_ui/properties_data_modifier.py
# source/blender/CMakeLists.txt
# source/blender/blenkernel/intern/scene.c
# source/blender/blenloader/intern/readfile.c
# source/blender/blenloader/intern/versioning_280.c
# source/blender/blenloader/intern/writefile.c
# source/blender/bmesh/intern/bmesh_polygon.c
# source/blender/draw/CMakeLists.txt
# source/blender/draw/intern/draw_manager.c
# source/blender/draw/modes/object_mode.c
# source/blender/editors/mesh/editmesh_tools.c
# source/blender/editors/mesh/mesh_ops.c
# source/blender/editors/render/render_intern.h
# source/blender/editors/render/render_ops.c
# source/blender/editors/space_outliner/outliner_draw.c
# source/blender/editors/space_view3d/space_view3d.c
# source/blender/makesdna/DNA_light_types.h
# source/blender/makesdna/DNA_modifier_types.h
# source/blender/makesdna/DNA_scene_types.h
# source/blender/makesdna/intern/makesdna.c
# source/blender/makesrna/intern/CMakeLists.txt
# source/blender/makesrna/intern/makesrna.c
# source/blender/makesrna/intern/rna_modifier.c
# source/blender/makesrna/intern/rna_scene.c
# source/blender/modifiers/CMakeLists.txt
# source/blender/modifiers/intern/MOD_util.c