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

[Brecht Van Lommel]

Commit: f60018e425ac5c488789ee15055f89f39e5cbb05
Author: Brecht Van Lommel
Date:   Tue Dec 11 15:18:43 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBf60018e425ac5c488789ee15055f89f39e5cbb05

Merge branch 'master' into blender2.8

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



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