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

[Julian Eisel]

Commit: a3313315bab8c3a4b3e2865e4f27de17662f16cd
Author: Julian Eisel
Date:   Thu Oct 26 22:57:47 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBa3313315bab8c3a4b3e2865e4f27de17662f16cd

Merge branch 'master' into blender2.8

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



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