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

[Bastien Montagne]

Commit: d85295534b6dad80b9c0db32708f7318ef79e134
Author: Bastien Montagne
Date:   Thu Feb 2 21:50:12 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBd85295534b6dad80b9c0db32708f7318ef79e134

Merge branch 'master' into blender2.8

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



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