[Bf-blender-cvs] [557dc7d3435] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 557dc7d34353992058451851a6ec1068d25b13d4
Author: Bastien Montagne
Date:   Thu Oct 12 16:40:35 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB557dc7d34353992058451851a6ec1068d25b13d4

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/editors/screen/screen_edit.c

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



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