Merge branch 'master' into blender2.8

diff --cc source/blender/blenkernel/intern/armature.c
Simple merge

diff --cc source/blender/blenkernel/intern/library.c
Simple merge

diff --cc source/blender/editors/include/UI_interface.h
Simple merge

diff --cc source/blender/editors/interface/interface.c
Simple merge

diff --cc source/blender/editors/interface/interface_intern.h
Simple merge

diff --cc source/blender/editors/interface/interface_regions.c
Simple merge

diff --cc source/blender/editors/interface/interface_templates.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_warp.c
Simple merge