[Bf-blender-cvs] [749caf49845] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 749caf49845401656d13124b9692e51d0dc77bc5
Author: Bastien Montagne
Date:   Wed Feb 7 21:54:52 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB749caf49845401656d13124b9692e51d0dc77bc5

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/windowmanager/intern/wm_files_link.c

===================================================================



===================================================================