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

[Philipp Oeser]

Commit: 25fcb44d2db2837b611aefb43207fc011b68a34a
Author: Philipp Oeser
Date:   Wed Dec 19 12:38:31 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB25fcb44d2db2837b611aefb43207fc011b68a34a

Merge branch 'master' into blender2.8

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



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