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

[Philipp Oeser]

Commit: 76bc8669a0fd469efa1c19cd461bcaf21cf0d5be
Author: Philipp Oeser
Date:   Fri Jun 15 10:44:33 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB76bc8669a0fd469efa1c19cd461bcaf21cf0d5be

Merge branch 'master' into blender2.8

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



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