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

[Bastien Montagne]

Commit: c26da06ae67348f62b27af33b76f2d18e6c7c274
Author: Bastien Montagne
Date:   Mon Jan 8 09:39:32 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBc26da06ae67348f62b27af33b76f2d18e6c7c274

Merge branch 'master' into blender2.8

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



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