Merge branch 'master' into blender2.8

diff --cc intern/cycles/blender/addon/ui.py
Simple merge

diff --cc release/scripts/startup/bl_ui/__init__.py
Simple merge

diff --cc source/blender/editors/object/object_modifier.c
Simple merge

diff --cc source/blender/windowmanager/intern/wm_files.c
Simple merge

diff --cc source/blender/windowmanager/intern/wm_init_exit.c
Simple merge

diff --cc source/blender/windowmanager/intern/wm_window.c
Simple merge