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

[Sybren A. Stüvel]

Commit: c6101b09eb26509b2ec5950a1af047e1a967efd1
Author: Sybren A. Stüvel
Date:   Wed Jan 17 12:38:52 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBc6101b09eb26509b2ec5950a1af047e1a967efd1

Merge branch 'master' into blender2.8

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



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