[Bf-blender-cvs] [9cfbdff71c0] blender2.8: Merge branch 'blender2.8' of git.blender.org:blender into blender2.8

[Jeroen Bakker]

Commit: 9cfbdff71c0c04d351f12d5674d54c15e3a978d9
Author: Jeroen Bakker
Date:   Wed May 2 16:59:42 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9cfbdff71c0c04d351f12d5674d54c15e3a978d9

Merge branch 'blender2.8' of git.blender.org:blender into blender2.8

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



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