Blender Git Loki

Merge branch 'master' into tmp-vulkan

# Conflicts:
# CMakeLists.txt
# intern/ghost/GHOST_C-api.h
# intern/ghost/GHOST_ISystem.h
# intern/ghost/intern/GHOST_C-api.cpp
# intern/ghost/intern/GHOST_System.h
# intern/ghost/intern/GHOST_SystemCocoa.h
# intern/ghost/intern/GHOST_SystemCocoa.mm
# intern/ghost/intern/GHOST_SystemNULL.h
# intern/ghost/intern/GHOST_SystemSDL.cpp
# intern/ghost/intern/GHOST_SystemSDL.h
# intern/ghost/intern/GHOST_SystemWayland.cpp
# intern/ghost/intern/GHOST_SystemWayland.h
# intern/ghost/intern/GHOST_SystemWin32.cpp
# intern/ghost/intern/GHOST_SystemWin32.h
# intern/ghost/intern/GHOST_SystemX11.cpp
# intern/ghost/intern/GHOST_SystemX11.h
# source/blender/blenkernel/BKE_global.h
# source/blender/windowmanager/intern/wm_window.c