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

[Philipp Oeser]

Commit: 0ec6196ae3ebab4f8cb90bc997c85d14c098aaef
Author: Philipp Oeser
Date:   Mon Jun 11 10:03:42 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0ec6196ae3ebab4f8cb90bc997c85d14c098aaef

Merge branch 'master' into blender2.8

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



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