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

[Sybren A. Stüvel]

Commit: c1a2f973daafa403664353526b8cf3c59cccf24c
Author: Sybren A. Stüvel
Date:   Mon Apr 9 15:44:28 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc1a2f973daafa403664353526b8cf3c59cccf24c

Merge branch 'master' into blender2.8

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



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