Conflicts: source/blender/blenloader/intern/readfile.c source/blender/windowmanager/intern/wm_window.c